From e83c6b411a1d2dbad750cafa53e3854e2648059a Mon Sep 17 00:00:00 2001
From: Jan Kiene <jan.kiene@iis.fraunhofer.de>
Date: Mon, 3 Jun 2024 15:22:52 +0200
Subject: [PATCH 1/2] use wildcard in artifact path

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00bfd1ae8..7e3be142e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,7 +273,8 @@ stages:
       - report.html
       - $CI_JOB_NAME-index.html
       - $MLD_ARTIFACT_NAME
-      - $CI_JOB_NAME-merged_csv--$CI_JOB_ID--$id_previous.csv
+      # the * wildcard is needed because $id_previous is undefined here
+      - $CI_JOB_NAME-merged_csv--$CI_JOB_ID--*.csv
     expose_as: "pytest mld results"
     reports:
       junit:
-- 
GitLab


From e68cd2ecdb2d5edd6d8e31edc4647f9264b10256 Mon Sep 17 00:00:00 2001
From: kiene <jan.kiene@iis.fraunhofer.de>
Date: Mon, 3 Jun 2024 13:25:55 +0000
Subject: [PATCH 2/2] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e3be142e..d025e6d44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -250,11 +250,11 @@ stages:
     -    unzip artifacts.zip -d previous_artifacts
     # This wildcard thingy relies on only one csv file being present per job
     -    file_previous="previous_artifacts/mld--ivas-pytest-mld-long-dec-$id_previous--sha-*.csv"
-    -    python3 ci/basop-pages/create_report_pages.py $CI_JOB_NAME-index.html $CI_JOB_NAME--merged_csv--$CI_JOB_ID--$id_previous.csv $MLD_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME
+    -    python3 ci/basop-pages/create_report_pages.py $CI_JOB_NAME-index.html $CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv $MLD_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME
     - else
     # create empty file for artifacts to avoid errors
     -    touch $CI_JOB_NAME-index.html
-    -    touch $CI_JOB_NAME--merged_csv--$CI_JOB_ID--$id_previous.csv
+    -    touch $CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv
     - fi
 
     - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi
@@ -274,7 +274,7 @@ stages:
       - $CI_JOB_NAME-index.html
       - $MLD_ARTIFACT_NAME
       # the * wildcard is needed because $id_previous is undefined here
-      - $CI_JOB_NAME-merged_csv--$CI_JOB_ID--*.csv
+      - $CI_JOB_NAME-merged_csv--$CI_JOB_ID.csv
     expose_as: "pytest mld results"
     reports:
       junit:
-- 
GitLab