[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 96a4593: Make artifacts working on emba (hopefully)
From: |
Michael Albinus |
Subject: |
master 96a4593: Make artifacts working on emba (hopefully) |
Date: |
Sun, 28 Mar 2021 04:08:09 -0400 (EDT) |
branch: master
commit 96a45935989acc400025bde50258aeb3b499716e
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Make artifacts working on emba (hopefully)
* test/infra/gitlab-ci.yml (.job-template): Use proper docker name.
(.test-template): Adapt artifacts path.
---
test/infra/gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index d061a69..bb79dc0 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -104,11 +104,11 @@ default:
- '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}"'
after_script:
- - docker ps -a
- - printenv
- - test -n "${make_params}" && ( docker export ${test_name} | tar -tvf - )
|| true
- # - test -n "${make_params}" && ( mkdir test-${test_name}; docker cp
${test_name}:test test-${test_name} ) || true
- - docker rm ${test_name}
+ # - docker ps -a
+ # - printenv
+ # - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export
${test_name} | tar -tvf - )
+ - 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}
.build-template:
rules:
@@ -146,7 +146,7 @@ default:
expire_in: 1 week
when: always
paths:
- - "test-${test_name}/**/*.log"
+ - "${test_name}/**/*.log"
.gnustep-template:
rules:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 96a4593: Make artifacts working on emba (hopefully),
Michael Albinus <=