summaryrefslogtreecommitdiff
path: root/test/infra/gitlab-ci.yml
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2021-10-12 18:53:54 +0200
committerMichael Albinus <michael.albinus@gmx.de>2021-10-12 18:53:54 +0200
commit83195c57e6136a8efdeed243e9fffbc1da344f7a (patch)
tree6fdb0e97cfe9439c6975e767ca7fa1bd1d88cecf /test/infra/gitlab-ci.yml
parentd4a033696d3389bd65d751050f98de12236e3101 (diff)
downloademacs-83195c57e6136a8efdeed243e9fffbc1da344f7a.tar.gz
Adapt emba control files
* test/infra/Dockerfile.emba: Print core pattern. * test/infra/gitlab-ci.yml (.job-template, .test-template): Improve wildcard. (.job-template): Add timeout.
Diffstat (limited to 'test/infra/gitlab-ci.yml')
-rw-r--r--test/infra/gitlab-ci.yml10
1 files changed, 4 insertions, 6 deletions
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 532d333e343..15327b00281 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -75,11 +75,11 @@ default:
- autogen.sh
- configure.ac
- lib/*.{h,c}
- - lisp/**/*.el
+ - lisp/**.el
- src/*.{h,c}
- test/infra/*
- test/lib-src/*.el
- - test/lisp/**/*.el
+ - test/lisp/**.el
- test/src/*.el
- changes:
# gfilemonitor, kqueue
@@ -107,7 +107,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 && make ${make_params}"'
+ - '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 3600s make ${make_params}"'
after_script:
# - docker ps -a
# - printenv
@@ -146,8 +146,6 @@ default:
- docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
.test-template:
- # Do not block later stages.
- # allow_failure: true
# Do not run fast and normal test jobs when scheduled.
rules:
- if: '$CI_JOB_STAGE =~ "fast|normal" && $CI_PIPELINE_SOURCE == "schedule"'
@@ -158,7 +156,7 @@ default:
public: true
expire_in: 1 week
paths:
- - "${test_name}/**/*.log"
+ - "**.log"
.gnustep-template:
rules: