OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: spread the usage of the FDO_UPSTREAM_REPO variable

Browse Source 
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:
Andres Gomez
2020-12-09 21:41:01 +02:00
committed by Marge Bot
parent 645e7b4b6c
commit 37258a6c4b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -407,7 +407,7 @@ arm64_test:
extends: extends:
- .use-arm_test-base - .use-arm_test-base
variables: variables:
MESA_IMAGE_TAG: &arm64_test "2020-12-16-cmake" MESA_IMAGE_TAG: &arm64_test "2020-12-17-fdo-upstream-repo"
.use-arm64_test: .use-arm64_test:
variables: variables:
@@ -421,7 +421,7 @@ armhf_test:
extends: extends:
- .use-arm_test-base - .use-arm_test-base
variables: variables:
MESA_IMAGE_TAG: &armhf_test "2020-12-16-cmake" MESA_IMAGE_TAG: &armhf_test "2020-12-17-fdo-upstream-repo"
.use-armhf_test: .use-armhf_test:
variables: variables:

2
.gitlab-ci/container/lava_build.sh
View File

@@ -12,7 +12,7 @@ check_minio()
} }
# If remote files are up-to-date, skip rebuilding them # If remote files are up-to-date, skip rebuilding them
check_minio "mesa/mesa" check_minio "${FDO_UPSTREAM_REPO}"
check_minio "${CI_PROJECT_PATH}" check_minio "${CI_PROJECT_PATH}"
. .gitlab-ci/container/container_pre_build.sh . .gitlab-ci/container/container_pre_build.sh

2
.gitlab-ci/download-git-cache.sh
View File

@@ -17,7 +17,7 @@ TMP_DIR=$(mktemp -d)
echo "Downloading archived master..." echo "Downloading archived master..."
/usr/bin/wget -O $TMP_DIR/mesa.tar.gz \ /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 # check wget error code
if [[ $? -ne 0 ]] if [[ $? -ne 0 ]]

4
.gitlab-ci/lava-gitlab-ci.yml
View File

@@ -1,5 +1,5 @@
variables: variables:
DISTRIBUTION_TAG: "2020-12-16-cmake" DISTRIBUTION_TAG: "2020-12-17-fdo-upstream-repo"
.kernel+rootfs: .kernel+rootfs:
stage: container-2 stage: container-2
@@ -51,7 +51,7 @@ kernel+rootfs_armhf:
script: script:
# Try to use the kernel and rootfs built in mainline first, to save cycles # 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}" ARTIFACTS_URL="${ARTIFACTS_PREFIX}/mesa/mesa/${DISTRIBUTION_TAG}/${ARCH}"
else else
ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}" ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}"