aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2021-10-15 16:10:53 +0200
committerMichael Albinus2021-10-15 16:10:53 +0200
commitaa55dd61e10e94733e290f32eae1d02a3535cfcd (patch)
tree7e514dc98b9ad6bc91d5e4c9d647125ad922af97
parent281f34f9de6f3cf7d731630df9d48d384c3d989d (diff)
downloademacs-aa55dd61e10e94733e290f32eae1d02a3535cfcd.tar.gz
emacs-aa55dd61e10e94733e290f32eae1d02a3535cfcd.zip
; Move timeout in gitlab-ci.yml
-rw-r--r--test/infra/gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index add05110dc1..98abd1d2c41 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -108,7 +108,7 @@ default:
108 # TODO: with make -j4 several of the tests were failing, for 108 # TODO: with make -j4 several of the tests were failing, for
109 # example shadowfile-tests, but passed without it. 109 # example shadowfile-tests, but passed without it.
110 - 'export PWD=$(pwd)' 110 - 'export PWD=$(pwd)'
111 - '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}"' 111 - 'timeout 7200s 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}"'
112 after_script: 112 after_script:
113 - docker ps -a 113 - docker ps -a
114 - printenv 114 - printenv