summaryrefslogtreecommitdiff
path: root/test/infra
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2021-11-28 13:45:43 +0100
committerMichael Albinus <michael.albinus@gmx.de>2021-11-28 13:45:43 +0100
commit1272a2cb6384e1d99586486a4903e17b43cbc3cd (patch)
tree9aab706123df9e0866964501429bda9311799672 /test/infra
parent44c856dccc7891a9f762ebef1e386ac9eef0a920 (diff)
downloademacs-1272a2cb6384e1d99586486a4903e17b43cbc3cd.tar.gz
Adapt gitlab-ci.yml
* test/infra/gitlab-ci.yml (variables): Set EMACS_TEST_TIMEOUT to 3600. (.job-template, .test-template): Another approach to catch test artifacts on emba.
Diffstat (limited to 'test/infra')
-rw-r--r--test/infra/gitlab-ci.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 759b8f69801..d12876e7727 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -44,8 +44,7 @@ workflow:
variables:
GIT_STRATEGY: fetch
EMACS_EMBA_CI: 1
- # Three hours, see below.
- EMACS_TEST_TIMEOUT: 10800
+ EMACS_TEST_TIMEOUT: 3600
EMACS_TEST_VERBOSE: 1
# Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
# DOCKER_HOST: tcp://docker:2376
@@ -91,9 +90,11 @@ default:
# - docker ps -a
# - 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 rm ${test_name}
- # - ls -alR ${test_name}
+ - find ${test_name} ! -name "*.log" -type f -delete
+ - find ${test_name} -empty -type d -delete
.build-template:
needs: []
@@ -133,7 +134,7 @@ default:
public: true
expire_in: 1 week
paths:
- - "${test_name}/**/*.log"
+ - ${test_name}/
when: always
.gnustep-template: