From 1a1fc6a94dac9c9e8b56be91e0912bc360d0a989 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Fri, 9 Dec 2022 15:31:01 +0100
Subject: [PATCH] add logging and error reporting in unzipping to pages job

---
 .gitlab-ci.yml | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a0f5d3385..aaa355eb35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1080,6 +1080,12 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
 # Other jobs
 # ---------------------------------------------------------------
 
+
+# helper for pages job
+.unzip-or-cat: &unzip-or-cat
+  - unzip -t $ARTIFACTS >> /dev/null
+  - if [ $? -eq 0 ]; then unzip -o $ARTIFACTS rm $ARTIFACTS; else cat $ARTIFACTS rm $ARTIFACTS; fi
+
 # job that sets up gitlab pages website
 # is run on a separate schedule and collects artifacts from other jobs (currently
 # only the complexity measurements) multiple times a day
@@ -1096,39 +1102,49 @@ pages:
     - branch=$CI_COMMIT_REF_NAME
 
     - mkdir public
+    - ARTIFACTS=artifacts.zip
 
     ### fetch artifacts from latest run of complexity jobs
     - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out)
     - echo $job_id
     - echo "$API_URL_BASE/$job_id/artifacts"
-    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_stereo.zip
-    - cat artifacts_comp_stereo.zip
-    - unzip -o artifacts_comp_stereo.zip
+    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
+    - *unzip-or-cat
     - mv complexity-stereo-in-stereo-out-public ./public/
 
     - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-ism-in-binaural-out)
-    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_ism.zip
-    - unzip -o artifacts_comp_ism.zip
+    - echo $job_id
+    - echo "$API_URL_BASE/$job_id/artifacts"
+    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
+    - *unzip-or-cat
     - mv complexity-ism-in-binaural-out-public ./public/
 
     - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-sba-hoa3-in-hoa3-out)
-    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_sba.zip
-    - unzip -o artifacts_comp_sba.zip
+    - echo $job_id
+    - echo "$API_URL_BASE/$job_id/artifacts"
+    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
+    - *unzip-or-cat
     - mv complexity-sba-hoa3-in-hoa3-out-public ./public/
 
     - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-mc-in-7_1_4-out)
-    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_mc.zip
-    - unzip -o artifacts_comp_mc.zip
+    - echo $job_id
+    - echo "$API_URL_BASE/$job_id/artifacts"
+    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
+    - *unzip-or-cat
     - mv complexity-mc-in-7_1_4-out-public ./public/
 
     - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-masa-in-7_1_4-out)
-    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_masa.zip
-    - unzip -o artifacts_comp_masa.zip
+    - echo $job_id
+    - echo "$API_URL_BASE/$job_id/artifacts"
+    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
+    - *unzip-or-cat
     - mv complexity-masa-in-7_1_4-out-public ./public/
 
     - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-StereoDmxEVS-stereo-in-mono-out)
-    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_StereoDmxEVS.zip
-    - unzip -o artifacts_comp_StereoDmxEVS.zip
+    - echo $job_id
+    - echo "$API_URL_BASE/$job_id/artifacts"
+    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
+    - *unzip-or-cat
     - mv complexity-StereoDmxEVS-stereo-in-mono-out-public ./public/
 
     - cp ci/index-pages.html public/index.html
-- 
GitLab