; Still fighting with emba.gnu.org config
* test/infra/gitlab-ci.yml (variables): Remove GIT_DEPTH. (.job-template): Set cache:policy to pull-push, as before. Check behavior of docker export. (.build-template): Remove needs and cache. (.test-template): Remove cache. Adapt artifacts:paths.
This commit is contained in:
parent
71505b723c
commit
1f4da7fe3e
1 changed files with 4 additions and 9 deletions
|
@ -42,7 +42,6 @@ workflow:
|
|||
- when: always
|
||||
|
||||
variables:
|
||||
GIT_DEPTH: 0
|
||||
GIT_STRATEGY: fetch
|
||||
EMACS_EMBA_CI: 1
|
||||
EMACS_TEST_JUNIT_REPORT: junit-test-report.xml
|
||||
|
@ -76,6 +75,7 @@ default:
|
|||
cache:
|
||||
key: ${CI_COMMIT_SHA}
|
||||
paths: []
|
||||
policy: pull-push
|
||||
# These will be saved for followup builds.
|
||||
artifacts:
|
||||
expire_in: 24 hrs
|
||||
|
@ -87,8 +87,8 @@ default:
|
|||
- 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} -e EMACS_TEST_JUNIT_REPORT=${EMACS_TEST_JUNIT_REPORT} -e EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} -e EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} -e NPROC=`nproc` --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -xvc "git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j \$NPROC && make -k -j \$NPROC ${make_params}"'
|
||||
after_script:
|
||||
# - docker ps -a
|
||||
# - printenv
|
||||
# - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - )
|
||||
- pwd; printenv
|
||||
- test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - )
|
||||
# Prepare test artifacts.
|
||||
- test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name}
|
||||
- test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/configure.log ${test_name}
|
||||
|
@ -98,9 +98,6 @@ default:
|
|||
- find ${test_name} -type d -depth -exec rmdir {} + 2>/dev/null
|
||||
|
||||
.build-template:
|
||||
needs: []
|
||||
cache:
|
||||
policy: push
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "web"'
|
||||
when: always
|
||||
|
@ -131,15 +128,13 @@ default:
|
|||
- docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
|
||||
|
||||
.test-template:
|
||||
cache:
|
||||
policy: pull
|
||||
artifacts:
|
||||
name: ${test_name}
|
||||
public: true
|
||||
expire_in: 1 week
|
||||
when: always
|
||||
paths:
|
||||
- ${test_name}/
|
||||
- "${test_name}/**.log"
|
||||
reports:
|
||||
junit: ${test_name}/${EMACS_TEST_JUNIT_REPORT}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue