From 4fbfd0e0915a3fcfc64c9fcbaf090878f5128321 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 3 Oct 2024 09:26:24 +0200 Subject: [PATCH] ; Minor changes in gitlab-ci.yml * test/infra/gitlab-ci.yml (.job-template): Comment test prints. (.test-template): Adapt paths: (cherry picked from commit 748f76c5b325fe1e3c79f04d43a50af862944aa1) --- test/infra/gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml index 809e05b9d0e..b99fb878f02 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml @@ -87,8 +87,8 @@ default: - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} -e EMACS_TEST_JUNIT_REPORT=${EMACS_TEST_JUNIT_REPORT} -e EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} -e EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} -e NPROC=`nproc` --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 -xvc "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 -j \$NPROC && make -k -j \$NPROC ${make_params}"' after_script: # - docker ps -a - - pwd; printenv - - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - ) + ' - pwd; printenv + # - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - ) # Prepare test artifacts. - 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 cp ${test_name}:checkout/configure.log ${test_name} @@ -134,7 +134,7 @@ default: expire_in: 1 week when: always paths: - - "${test_name}/**.log" + - ${test_name}/ reports: junit: ${test_name}/${EMACS_TEST_JUNIT_REPORT} -- 2.39.2