[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d8d71ce: Further gitlab-ci.yml changes
From: |
Michael Albinus |
Subject: |
master d8d71ce: Further gitlab-ci.yml changes |
Date: |
Fri, 15 Oct 2021 05:02:07 -0400 (EDT) |
branch: master
commit d8d71cef9e7b653dbbb0e89ab24eab45e756ed49
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Further gitlab-ci.yml changes
* test/infra/gitlab-ci.yml (.job-template): Add --timeout.
(.test-template): Adapt artifact paths.
---
test/infra/gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 9c7beea..05341bd 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -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:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master d8d71ce: Further gitlab-ci.yml changes,
Michael Albinus <=