From 7cb9668ef6959d8d207b41f50ef1dd121b8587a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Mon, 3 Jun 2024 07:17:10 +0200 Subject: [PATCH] Ensure report-built-images doesn't fail when no images were built MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- .gitlab/ci/definitions.yml | 1 + .gitlab/ci/report.yml | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/definitions.yml b/.gitlab/ci/definitions.yml index 2cf9945..62391fe 100644 --- a/.gitlab/ci/definitions.yml +++ b/.gitlab/ci/definitions.yml @@ -57,6 +57,7 @@ -t "$CI_REGISTRY_IMAGE:$IMAGE_NAME" \ -f "Dockerfile.$IMAGE_NAME" \ . + - 'echo "${CI_JOB_URL}: ${IMAGE_NAME}" > "${CI_JOB_ID}-${CI_JOB_NAME_SLUG}-built-image.txt"' rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never diff --git a/.gitlab/ci/report.yml b/.gitlab/ci/report.yml index 686c015..1cc907d 100644 --- a/.gitlab/ci/report.yml +++ b/.gitlab/ci/report.yml @@ -2,8 +2,19 @@ report-built-images: image: alpine stage: report script: - - cat *-built-image.txt > all-built-images.txt - - cat all-built-images.txt + - | + set -- "${CI_PROJECT_DIR}"/*-built-image.txt + + while [ "$#" -gt 0 ] && [ ! -f "$1" ]; do + shift + done + + if [ -f "$1" ]; then + cat *-built-image.txt > all-built-images.txt + cat all-built-images.txt + else + echo "No images built"; + fi artifacts: paths: ["all-built-images.txt"] expire_in: 90d