From 4827c3c6d514d2bed1b6b2f097f12b163e27f531 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Thu, 20 Oct 2022 03:03:08 -0300 Subject: [PATCH] ci: Update ci-fairy in CI, rootfs and containers ci-fairy is pulverized in possible different versions at Mesa CI. This commit updates all of them to the version that migrates minio to s3. Also, trigger the build of base and test containers, as both uses ci-fairy as well Solved Conflicts: .gitlab-ci/image-tags.yml Signed-off-by: Guilherme Gallo Signed-off-by: Benjamin Tissoires (cherry picked from commit a04ed2f971dccbf8b24f084ac9baaf8b299944a0) Part-of: --- .gitlab-ci.yml | 2 +- .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 +- .gitlab-ci/image-tags.yml | 8 ++++---- src/freedreno/ci/traces-freedreno.yml | 2 +- src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d608142d346..38455f1c860 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ default: include: - project: 'freedesktop/ci-templates' - ref: 34f4ade99434043f88e164933f570301fd18b125 + ref: ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 file: - '/templates/ci-fairy.yml' - project: 'freedesktop/ci-templates' diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 7b529ec7016..9d890da3f08 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -96,7 +96,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@34f4ade99434043f88e164933f570301fd18b125 +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 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 aa03ade8243..29dd3905d01 100644 --- a/.gitlab-ci/container/debian/arm_build.sh +++ b/.gitlab-ci/container/debian/arm_build.sh @@ -60,7 +60,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@34f4ade99434043f88e164933f570301fd18b125 +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 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 042d6c9ae2c..6aac6c9846e 100644 --- a/.gitlab-ci/container/debian/x86_build-base.sh +++ b/.gitlab-ci/container/debian/x86_build-base.sh @@ -76,7 +76,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@34f4ade99434043f88e164933f570301fd18b125 +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 . .gitlab-ci/container/debian/x86_build-base-wine.sh diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index 9d522ee5a84..9d019c19498 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -64,7 +64,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@34f4ade99434043f88e164933f570301fd18b125 +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 ############### Build dEQP runner . .gitlab-ci/container/build-deqp-runner.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index bd19fe99d49..a3bea373bbc 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,9 +1,9 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-10-19-remove-xvmc-dev" + DEBIAN_BASE_TAG: "2022-11-03-ci-fairy-s3" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2022-07-14-directx-headers" + DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" DEBIAN_BUILD_MINGW_TAG: "2022-07-14-directx-headers" @@ -11,8 +11,8 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-10-20-bindgen-zlib-cve" - DEBIAN_X86_TEST_VK_TAG: "2022-10-20-bindgen-zlib-cve" + DEBIAN_X86_TEST_GL_TAG: "2022-11-04-ci-fairy-s3" + DEBIAN_X86_TEST_VK_TAG: "2022-11-04-ci-fairy-s3" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" KERNEL_ROOTFS_TAG: "2022-11-03-piglit" diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml index 4ac3e03f479..6eda8f932f9 100644 --- a/src/freedreno/ci/traces-freedreno.yml +++ b/src/freedreno/ci/traces-freedreno.yml @@ -1,5 +1,5 @@ traces-db: - download-url: "http://10.42.0.1:8888/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/" + download-url: "http://10.42.0.1:8888/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/" # NOTE for faster runtime, try to sort tests so the longer running traces # appear first (and therefore are started first). diff --git a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml index b44661fa697..0823b98d029 100644 --- a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml +++ b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml @@ -1,5 +1,5 @@ traces-db: - download-url: "http://caching-proxy/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/" + download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/" traces: - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace