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

ci: Remove MESA_ARM_BUILD_TAG environment variable

Browse Source 
Its value is already the same as MESA_IMAGE_TAG so no need to duplicate it.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20488>
This commit is contained in:
Corentin Noël
2023-01-04 11:34:46 +01:00
committed by Marge Bot
parent 37d56a0576
commit 305f0de7a3
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci/container/gitlab-ci.yml
View File

@@ -347,10 +347,10 @@ kernel+rootfs_armhf:
# Don't want the .container rules # Don't want the .container rules
- .build-rules - .build-rules
variables: variables:
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava" ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava"
ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_ARM_BUILD_TAG: *debian-arm_build MESA_ARTIFACTS_TAG: *debian-arm_build
MESA_ROOTFS_TAG: *kernel-rootfs MESA_ROOTFS_TAG: *kernel-rootfs
debian/armhf_test: debian/armhf_test:
@@ -371,11 +371,10 @@ debian/arm64_test:
.use-debian/arm_test: .use-debian/arm_test:
variables: variables:
MESA_ARM_BUILD_TAG: *debian-arm_build
MESA_ROOTFS_TAG: *kernel-rootfs MESA_ROOTFS_TAG: *kernel-rootfs
.use-debian/armhf_test: .use-debian/armhf_test:
image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
extends: extends:
- .use-debian/arm_test - .use-debian/arm_test
variables: variables:
@@ -385,7 +384,7 @@ debian/arm64_test:
- debian/arm_test - debian/arm_test
.use-debian/arm64_test: .use-debian/arm64_test:
image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
extends: extends:
- .use-debian/arm_test - .use-debian/arm_test
variables: variables: