From 37258a6c4b5b37faf3df66a7c10f079c229db3a9 Mon Sep 17 00:00:00 2001
From: Andres Gomez <agomez@igalia.com>
Date: Wed, 9 Dec 2020 21:41:01 +0200
Subject: [PATCH] ci: spread the usage of the FDO_UPSTREAM_REPO variable

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388>
---
 .gitlab-ci.yml                     | 4 ++--
 .gitlab-ci/container/lava_build.sh | 2 +-
 .gitlab-ci/download-git-cache.sh   | 2 +-
 .gitlab-ci/lava-gitlab-ci.yml      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25dc14b1c7e..d78dca26e85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -407,7 +407,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2020-12-16-cmake"
+    MESA_IMAGE_TAG: &arm64_test "2020-12-17-fdo-upstream-repo"
 
 .use-arm64_test:
   variables:
@@ -421,7 +421,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2020-12-16-cmake"
+    MESA_IMAGE_TAG: &armhf_test "2020-12-17-fdo-upstream-repo"
 
 .use-armhf_test:
   variables:
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 457d098ca4e..5a163aca5b5 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -12,7 +12,7 @@ check_minio()
 }
 
 # If remote files are up-to-date, skip rebuilding them
-check_minio "mesa/mesa"
+check_minio "${FDO_UPSTREAM_REPO}"
 check_minio "${CI_PROJECT_PATH}"
 
 . .gitlab-ci/container/container_pre_build.sh
diff --git a/.gitlab-ci/download-git-cache.sh b/.gitlab-ci/download-git-cache.sh
index 693925e975b..0a6d57031a9 100644
--- a/.gitlab-ci/download-git-cache.sh
+++ b/.gitlab-ci/download-git-cache.sh
@@ -17,7 +17,7 @@ TMP_DIR=$(mktemp -d)
 
 echo "Downloading archived master..."
 /usr/bin/wget -O $TMP_DIR/mesa.tar.gz \
-              https://minio-packet.freedesktop.org/git-cache/mesa/mesa/mesa.tar.gz
+              https://minio-packet.freedesktop.org/git-cache/${FDO_UPSTREAM_REPO}/mesa.tar.gz
 
 # check wget error code
 if [[ $? -ne 0 ]]
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 6bba53f7547..27c76c3e38d 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-12-16-cmake"
+  DISTRIBUTION_TAG: "2020-12-17-fdo-upstream-repo"
 
 .kernel+rootfs:
   stage: container-2
@@ -51,7 +51,7 @@ kernel+rootfs_armhf:
   script:
     # Try to use the kernel and rootfs built in mainline first, to save cycles
     - >
-      if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/mesa/mesa/${DISTRIBUTION_TAG}/${ARCH}/done"; then
+      if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${ARCH}/done"; then
         ARTIFACTS_URL="${ARTIFACTS_PREFIX}/mesa/mesa/${DISTRIBUTION_TAG}/${ARCH}"
       else
         ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}"