mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-13 11:12:19 -08:00
Code Issues Projects Releases Wiki Activity

Further gitlab-ci.yml changes

Browse source 
* test/infra/gitlab-ci.yml (.job-template): Add --timeout.
(.test-template): Adapt artifact paths.
This commit is contained in:
Michael Albinus 2021-10-15 11:01:55 +02:00
parent e16974a10d
commit d8d71cef9e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/infra/gitlab-ci.yml
View file

@ -108,7 +108,7 @@ default:
# TODO: with make -j4 several of the tests were failing, for
# example shadowfile-tests, but passed without it.
- 'export PWD=$(pwd)'
- 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} --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 -c "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 -j4 && timeout -s ABRT 3600s make ${make_params}"'
- 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} --timeout=7200 --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 -c "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 -j4 && timeout -s ABRT 3600s make ${make_params}"'
after_script:
- docker ps -a
- printenv
@ -116,7 +116,6 @@ default:
- 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 rm ${test_name}
- ls -alR ${test_name}
- docker ps -a
.build-template:
needs: []
@ -159,8 +158,9 @@ default:
public: true
expire_in: 1 week
paths:
- "**.log"
- "**core"
- ${test_name}/**/*.log
- ${test_name}/**/core
- ${test_name}/core
when: always
.gnustep-template: