From 19cb49c280ab1437f39f723719b5a501ff5aa4f4 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Fri, 5 Nov 2021 00:13:01 -0300 Subject: [PATCH] ci: Update ci-fairy to version with --token-file support Signed-off-by: Guilherme Gallo Reviewed-by: Cristian Ciocaltea Part-of: --- .gitlab-ci.yml | 14 +++++++------- .gitlab-ci/container/create-rootfs.sh | 2 +- .gitlab-ci/container/debian/arm_build.sh | 2 +- .gitlab-ci/container/debian/x86_build-base.sh | 2 +- .gitlab-ci/container/debian/x86_test-base.sh | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fb60dc3c03..a70eb2bc085 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index f8a888cad9b..674fd62e457 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -71,7 +71,7 @@ apt-get -y install --no-install-recommends \ # Needed for ci-fairy, this revision is able to upload files to # MinIO and doesn't depend on git -pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125 apt-get purge -y \ $INSTALL_CI_FAIRY_PACKAGES diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh index c16e9474de0..6d1c255e72c 100644 --- a/.gitlab-ci/container/debian/arm_build.sh +++ b/.gitlab-ci/container/debian/arm_build.sh @@ -57,7 +57,7 @@ apt-get -y install \ apt-get install -y --no-remove -t buster \ android-sdk-ext4-utils -pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366 +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125 arch=armhf . .gitlab-ci/container/cross_build.sh diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh index 42cc76f2941..85a6a6f0002 100644 --- a/.gitlab-ci/container/debian/x86_build-base.sh +++ b/.gitlab-ci/container/debian/x86_build-base.sh @@ -72,7 +72,7 @@ apt-get install -y --no-remove \ zlib1g-dev # Needed for ci-fairy, this revision is able to upload files to MinIO -pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366 +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125 ############### Uninstall ephemeral packages diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index 362cf7e9e7b..7d56e7825f7 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -59,7 +59,7 @@ apt-get install -y --no-install-recommends \ # Needed for ci-fairy, this revision is able to upload files to MinIO # and doesn't depend on git -pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125 ############### Build dEQP runner . .gitlab-ci/container/build-deqp-runner.sh