ci/b2c: drop logic to remove install.tar
authorEric Engestrom <eric@igalia.com>
Fri, 8 Sep 2023 08:58:30 +0000 (09:58 +0100)
committerMarge Bot <emma+marge@anholt.net>
Fri, 8 Sep 2023 17:28:15 +0000 (17:28 +0000)
It's still buggy, and it turns out `mcli` has some logic to check if
a file really needs to be re-uploaded, so this doesn't actually change
much to the time uploads take.

This effectively reverts https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24196

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25114>

.gitlab-ci/test/gitlab-ci.yml

index d82eea2..fb0b78a 100644 (file)
@@ -339,7 +339,7 @@ clang-format:
       [ -d "$CI_COMMON_SCRIPTS" ] || exit 1
 
 
-      B2C_TEST_SCRIPT="bash -euc 'if [ -f ${INSTALL_TARBALL_NAME} ]; then tar xf ${INSTALL_TARBALL_NAME} && rm ${INSTALL_TARBALL_NAME}; fi; [ -d install/ ]; ./install/common/init-stage2.sh'"
+      B2C_TEST_SCRIPT="bash -euc 'tar xf ${INSTALL_TARBALL_NAME}; ./install/common/init-stage2.sh'"
 
       # The Valve CI gateway receives jobs in a YAML format. Create a
       # job description from the CI environment.