From 2af6b535881867cc5a941063459e9df508d8c650 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 21 Jan 2021 15:41:18 -0800
Subject: [PATCH] ci/freedreno: Use the http cache for artifacts downloads,
 too.

The gitlab artifacts handling has been slow in the past as we hit
gitlab.fdo from multiple runners, and it costs fd.o egress bandwidth.  Use
the local http cache against the packet.net minio to cut that downloads
cost.

Closes: #3249
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8727>
---
 .gitlab-ci.yml                        | 15 +++++++++++++--
 .gitlab-ci/bare-metal/fastboot.sh     |  1 +
 .gitlab-ci/bare-metal/rootfs-setup.sh |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02f29e00e8d..73abfc7cbc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1537,6 +1537,14 @@ arm64_a630_piglit_shader:
   # Cancel job if a newer commit is pushed to the same branch
   interruptible: true
   stage: test
+  variables:
+    DRIVER_URL: https://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-arm64.tar.gz
+  before_script:
+    # Use this instead of gitlab's artifacts download because it hits packet.net
+    # instead of fd.o.  Set FDO_HTTP_CACHE_URI to an http cache for your test lab to
+    # improve it even more (see https://docs.mesa3d.org/ci/bare-metal.html for
+    # setup).
+    - wget ${FDO_HTTP_CACHE_URI:-}${DRIVER_URL} -S --progress=dot:giga -O- | tar -xz
   artifacts:
     when: always
     name: "mesa_${CI_JOB_NAME}"
@@ -1560,7 +1568,8 @@ arm64_a630_piglit_shader:
     - ./install/bare-metal/fastboot.sh
   needs:
     - arm64_test
-    - meson-arm64
+    - job: meson-arm64
+      artifacts: false
   tags:
     - google-freedreno-db410c
 
@@ -1726,10 +1735,12 @@ arm64_a530_piglit_shader:
     BM_ROOTFS_EXTRA: /modules/armhf
     GPU_VERSION: vc4-rpi3
     DEQP_EXPECTED_RENDERER: VC4
+    DRIVER_URL: https://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-armhf.tar.gz
   script:
     - ./install/bare-metal/poe-powered.sh
   needs:
-    - armhf_test
+    - job: armhf_test
+      artifacts: false
     - meson-armhf
   tags:
     - igalia-rpi3
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 1e492fe6d6b..eede57fff94 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -100,6 +100,7 @@ else
   cat $BM_KERNEL $BM_DTB > Image.gz-dtb
 fi
 
+mkdir -p artifacts
 abootimg \
   --create artifacts/fastboot.img \
   -k Image.gz-dtb \
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh
index 99e0c25c885..ac4cd96117a 100644
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -79,5 +79,5 @@ set -x
 
 # Add the Mesa drivers we built, and make a consistent symlink to them.
 mkdir -p $rootfs_dst/$CI_PROJECT_DIR
-tar -C $rootfs_dst/$CI_PROJECT_DIR/ -xf $CI_PROJECT_DIR/artifacts/install.tar
+rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/
 ln -sf $CI_PROJECT_DIR/install $rootfs_dst/install