From a93f9e7e55a1fade91cb2d06b2ed39aab2c31b65 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 9 Sep 2020 18:22:21 +0100
Subject: [PATCH] CI: Be consistent about where we put test artifacts

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 debian/gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index 888dac07c..64fa4929f 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -243,13 +243,13 @@ test:debian-10:
         - |
             set -eux
 
-            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_buster_test_logs"
+            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_build/artifacts"
             export PRESSURE_VESSEL_TEST_CONTAINERS="$(pwd)/_build/depot"
             python3 tests/containers.py
 
     artifacts:
         paths:
-            - _buster_test_logs
+            - _build/artifacts
 
 test:ubuntu-18.04:
     extends: .test_template
@@ -260,13 +260,13 @@ test:ubuntu-18.04:
         - |
             set -eux
 
-            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_bionic_test_logs"
+            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_build/artifacts"
             export PRESSURE_VESSEL_TEST_CONTAINERS="$(pwd)/_build/depot"
             python3 tests/containers.py
 
     artifacts:
         paths:
-            - _bionic_test_logs
+            - _build/artifacts
 
 test:ubuntu-20.04:
     extends: .test_template
@@ -277,13 +277,13 @@ test:ubuntu-20.04:
         - |
             set -eux
 
-            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_ubuntu_focal_test_logs"
+            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_build/artifacts"
             export PRESSURE_VESSEL_TEST_CONTAINERS="$(pwd)/_build/depot"
             python3 tests/containers.py
 
     artifacts:
         paths:
-            - _ubuntu_focal_test_logs
+            - _build/artifacts
 
 test:archlinux:
     extends: .test_template
@@ -313,13 +313,13 @@ test:archlinux:
         - |
             set -eux
 
-            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_archlinux_test_logs"
+            export AUTOPKGTEST_ARTIFACTS="$(pwd)/_build/artifacts"
             export PRESSURE_VESSEL_TEST_CONTAINERS="$(pwd)/_build/depot"
             python3 tests/containers.py
 
     artifacts:
         paths:
-            - _archlinux_test_logs
+            - _build/artifacts
 
 autopkgtest:
     stage: test
-- 
GitLab