From: Eric Engestrom <eric@igalia.com>
Date: Thu, 31 Aug 2023 12:32:06 +0000 (+0100)
Subject: ci/b2c: skip install.tar extraction if the tarball is not present
X-Git-Tag: upstream/23.3.3~2657
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95a9f66f30a6026f4ac46059e4cbcd65f1a48881;p=platform%2Fupstream%2Fmesa.git

ci/b2c: skip install.tar extraction if the tarball is not present

This is the case when retrying after a B2C_TIMEOUT for instance.

Fixes: 85a8f03211090bc9a23a ("ci: delete install.tar after extracting it to avoid re-uploading it")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24970>
---

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 84000b2..2a8f6919 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -337,7 +337,7 @@ clang-format:
       [ -d "$CI_COMMON_SCRIPTS" ] || exit 1
 
 
-      B2C_TEST_SCRIPT="bash -c 'tar xf ${INSTALL_TARBALL_NAME} && rm ${INSTALL_TARBALL_NAME}; ./install/common/init-stage2.sh'"
+      B2C_TEST_SCRIPT="bash -c 'if [ -f ${INSTALL_TARBALL_NAME} ]; then tar xf ${INSTALL_TARBALL_NAME} && rm ${INSTALL_TARBALL_NAME}; fi; ./install/common/init-stage2.sh'"
 
       # The Valve CI gateway receives jobs in a YAML format. Create a
       # job description from the CI environment.