From 935ba13ee4c2a2d950887b784d4a903417582c5f 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 | 20 ++++++++++---------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d6de8c..acd0181 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,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 74614ca..8ead0f4 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -123,7 +123,7 @@ fi # 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 # Needed for manipulation with traces yaml files. pip3 install yq diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh index df66f94..3ee9dea 100644 --- a/.gitlab-ci/container/debian/arm_build.sh +++ b/.gitlab-ci/container/debian/arm_build.sh @@ -68,7 +68,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 fde9bc0..92d21d2 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 \ zstd # 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 # We need at least 0.61.4 for proper Rust pip3 install meson==0.61.5 diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index cb5ba61..36a392f 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -118,7 +118,7 @@ mkdir -p /lava-files/ # 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 # Needed for manipulation with traces yaml files. pip3 install yq diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index d7b4435..0ffa7fd 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-15-ci-fairy" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2022-10-22-mold-1_6" + DEBIAN_BUILD_TAG: "2022-11-15-ci-fairy" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" DEBIAN_BUILD_MINGW_TAG: "2022-10-18-dx-headers-va" @@ -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-15-ci-fairy" + DEBIAN_X86_TEST_VK_TAG: "2022-11-15-ci-fairy" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" KERNEL_ROOTFS_TAG: "2022-11-03-piglit_mesa-22.3" diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml index 6e9c267..8b3a430 100644 --- a/src/freedreno/ci/traces-freedreno.yml +++ b/src/freedreno/ci/traces-freedreno.yml @@ -129,24 +129,24 @@ traces: zink-a630: checksum: d25edb433abfcde517b626b3071906ff - glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false-v2.trace: - freedreno-a306: + ? glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false-v2.trace + : freedreno-a306: checksum: 67f73c60b3ff286b7a4a10f4c14eec8b freedreno-a530: checksum: eaee77d5109260a2c91f38e7428a9cb6 freedreno-a630: checksum: e79224d7afc13318a3511b3dbdca57c1 - glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true-v2.trace: - freedreno-a306: + ? glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true-v2.trace + : freedreno-a306: checksum: ec04315638a814e1bd870f52883a4564 freedreno-a530: checksum: 52b81ddea38b362105b64847d64b80c9 freedreno-a630: checksum: df325d374967a1508675f17d38a16a2c - glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false-v2.trace: - freedreno-a306: + ? glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false-v2.trace + : freedreno-a306: checksum: f03b78ff377bacd073b4bc46384c4c06 freedreno-a530: checksum: 9209aa63fcc0c3608bbb0299437fd54c @@ -201,8 +201,8 @@ traces: freedreno-a630: checksum: 809b7b66f30f134490012817a30774c3 - glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace: - freedreno-a306: + ? glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace + : freedreno-a306: checksum: e24428dc1f1669e2fa763a14ff81a35e freedreno-a530: checksum: 70e18ba06d56fea277cd3fb000729879 @@ -431,7 +431,7 @@ traces: freedreno-a630: checksum: f83f7ad4b147607e2a7de65a48f8ed4d label: [crash] - text: 'intermittent msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A630: hangcheck detected gpu lockup rb 0!' + text: "intermittent msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A630: hangcheck detected gpu lockup rb 0!" gputest/pixmark-piano-v2.trace: freedreno-a630: @@ -651,7 +651,7 @@ traces: text: needs GL 4.5 freedreno-a630: label: [crash, no-perf] - text: 'msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A630: hangcheck detected gpu lockup rb 0!' + text: "msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A630: hangcheck detected gpu lockup rb 0!" blender/blender-demo-ellie_pose.trace: freedreno-a306: label: [unsupported] -- 2.7.4