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

ci: Update ci-fairy to version with --token-file support

Browse Source 
Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14004>
This commit is contained in:
Guilherme Gallo
2021-11-05 00:13:01 -03:00
committed by Marge Bot
parent 3161bc5c1a
commit 19cb49c280
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@@ -18,7 +18,7 @@ variables:
include:
- project: 'freedesktop/ci-templates'
ref: 79c325922670137e8f0a4dc5f6f097e0eb57c1af
ref: 34f4ade99434043f88e164933f570301fd18b125
file:
- '/templates/ci-fairy.yml'
- project: 'freedesktop/ci-templates'
@@ -292,7 +292,7 @@ debian/x86_build-base:
- .fdo.container-build@debian
- .container
variables:
MESA_IMAGE_TAG: &debian-x86_build-base "2021-11-25-libdrm"
MESA_IMAGE_TAG: &debian-x86_build-base "2021-11-25-ci-fairy"
.use-debian/x86_build-base:
extends:
@@ -394,7 +394,7 @@ debian/android_build:
debian/x86_test-base:
extends: debian/x86_build-base
variables:
MESA_IMAGE_TAG: &debian-x86_test-base "2021-11-25-libdrm"
MESA_IMAGE_TAG: &debian-x86_test-base "2021-11-25-ci-fairy"
.use-debian/x86_test-base:
extends:
@@ -412,13 +412,13 @@ debian/x86_test-gl:
variables:
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-25-libdrm"
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-25-ci-fairy"
# Debian 11 based x86 test image for VK
debian/x86_test-vk:
extends: .use-debian/x86_test-base
variables:
MESA_IMAGE_TAG: &debian-x86_test-vk "2021-11-25-libdrm"
MESA_IMAGE_TAG: &debian-x86_test-vk "2021-11-25-ci-fairy"
# Debian 11 based ARM build image
debian/arm_build:
@@ -428,7 +428,7 @@ debian/arm_build:
tags:
- aarch64
variables:
MESA_IMAGE_TAG: &debian-arm_build "2021-11-25-libdrm"
MESA_IMAGE_TAG: &debian-arm_build "2021-11-25-ci-fairy"
.use-debian/arm_build:
extends:
@@ -467,7 +467,7 @@ fedora/x86_build:
variables:
GIT_STRATEGY: fetch
KERNEL_URL: *kernel-rootfs-url
MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-25-libdrm"
MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-25-ci-fairy"
DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
script:
- .gitlab-ci/container/lava_build.sh