[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 526220c: ; Adapt recent change in test/infra/gitlab-ci.yml
From: |
Michael Albinus |
Subject: |
master 526220c: ; Adapt recent change in test/infra/gitlab-ci.yml |
Date: |
Sat, 27 Mar 2021 12:47:53 -0400 (EDT) |
branch: master
commit 526220c53dd22bcfbd1daad321143c3d13e92a7b
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
; Adapt recent change in test/infra/gitlab-ci.yml
---
test/infra/gitlab-ci.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 16f7f3c..91315ad 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -102,11 +102,9 @@ default:
- docker pull ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
# 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
${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 && make ${make_params}"'
after_script:
- - 'docker ps -a'
- - 'docker cp $(docker ps -q -f
"label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):test test-${test_name}'
- - 'docker rm $(docker ps -q -f
"label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}")'
+ - 'docker rm ${test_name}'
.build-template:
rules:
@@ -138,6 +136,10 @@ default:
- docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
.test-template:
+ script:
+ - mkdir test-${test_name}
+ - docker ps -a
+ - docker cp ${test_name}:test test-${test_name}
artifacts:
name: ${test_name}
public: true
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 526220c: ; Adapt recent change in test/infra/gitlab-ci.yml,
Michael Albinus <=