From d6344b2e9a1edb384770ceba757779dca49158d2 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 27 Mar 2021 11:43:15 +0100
Subject: [PATCH] Keep *.log files on emba

* test/infra/gitlab-ci.yml (.test-template): New template.
(test-fast-inotify, test-lisp-inotify, test-lisp-net-inotify)
(test-filenotify-gio, test-gnustep, test-all-inotify): Use it.
---
 test/infra/Dockerfile.emba |  3 ++-
 test/infra/gitlab-ci.yml   | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index cde657aada6..30a58971340 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -47,7 +47,8 @@ RUN make -j4
 FROM emacs-base as emacs-filenotify-gio
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 libglib2.0-dev libglib2.0-bin libglib2.0-0 \
+    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
+      libglib2.0-dev libglib2.0-bin libglib2.0-0 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /checkout
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 5a0ab54e4b9..d91c3a411ec 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -133,6 +133,12 @@ default:
     - docker build --pull --target ${target} -t ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} -f test/infra/Dockerfile.emba .
     - docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
 
+.test-template:
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - "test/**/*.log"
+
 .gnustep-template:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "web"'
@@ -185,7 +191,7 @@ build-image-inotify:
 
 test-fast-inotify:
   stage: fast
-  extends: [.job-template]
+  extends: [.job-template, .test-template]
   variables:
     target: emacs-inotify
     make_params: "-C test check"
@@ -204,14 +210,14 @@ build-image-gnustep:
 
 test-lisp-inotify:
   stage: normal
-  extends: [.job-template]
+  extends: [.job-template, .test-template]
   variables:
     target: emacs-inotify
     make_params: "-C test check-lisp"
 
 test-lisp-net-inotify:
   stage: normal
-  extends: [.job-template]
+  extends: [.job-template, .test-template]
   variables:
     target: emacs-inotify
     make_params: "-C test check-lisp-net"
@@ -219,7 +225,7 @@ test-lisp-net-inotify:
 test-filenotify-gio:
   # This tests file monitor libraries gfilemonitor and gio.
   stage: platforms
-  extends: [.job-template, .filenotify-gio-template]
+  extends: [.job-template, .test-template, .filenotify-gio-template]
   variables:
     target: emacs-filenotify-gio
     make_params: "-k -C test autorevert-tests filenotify-tests"
@@ -227,7 +233,7 @@ test-filenotify-gio:
 test-gnustep:
   # This tests the GNUstep build process
   stage: platforms
-  extends: [.job-template, .gnustep-template]
+  extends: [.job-template, .test-template, .gnustep-template]
   variables:
     target: emacs-gnustep
     make_params: install
@@ -235,7 +241,7 @@ test-gnustep:
 test-all-inotify:
   # This tests also file monitor libraries inotify and inotifywatch.
   stage: slow
-  extends: [.job-template]
+  extends: [.job-template, .test-template]
   rules:
     # note there's no "changes" section, so this always runs on a schedule
     - if: '$CI_PIPELINE_SOURCE == "web"'
-- 
2.39.2