; Adapt recent change in test/infra/gitlab-ci.yml

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 16f7f3ca15363cd01aa309600f801a27a132fee1..91315ad21d6556ebe2ca16f32d07d6c76c59cc25 100644 (file)
--- 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