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>
This commit is contained in:
parent
645e7b4b6c
commit
37258a6c4b
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ]]
|
||||
|
|
|
@ -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}"
|
||||
|
|
Loading…
Reference in New Issue