From: Guilherme Gallo <guilherme.gallo@collabora.com>
Date: Thu, 9 Mar 2023 17:46:56 +0000 (-0300)
Subject: ci/baremetal: Wrap artifact download curl with xtrace
X-Git-Tag: upstream/23.3.3~11826
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc178c044eca6175b9b9a4d01938a6de147599f7;p=platform%2Fupstream%2Fmesa.git

ci/baremetal: Wrap artifact download curl with xtrace

Setting `set -x`can be useful to known via trace which URL baremetal
used to download artifacts.
Today its only printed the command with the environment variables.

Also, this commit fixes multiple `section_end` for the related Gitlab
sections.

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21804>
---

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index dd5a7aa..1981ad2 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -152,8 +152,7 @@ rustfmt:
     - section_start artifacts_download "Downloading artifacts from s3"
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
     - rm -rf install
-    - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst | tar --zstd -x
-    - echo -e "\e[0Ksection_end:$(date +%s):artifacts_download\r\e[0K"
+    - (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst | tar --zstd -x)
     - section_end artifacts_download
   artifacts:
     when: always