From 37602ad65386fdb2a2178f851b2f688416370655 Mon Sep 17 00:00:00 2001 From: Deborah Brouwer Date: Fri, 1 Nov 2024 18:27:43 -0700 Subject: [PATCH] ci: simplify .baremetal-arm64-asan-test The `.baremetal-arm64-asan-test` job extends `.baremetal-test` and `.use-debian/baremetal_arm64_test` but doing this is unnecessary because all of the arm64-asan jobs also inherit the `.baremetal-test-arm64` job which does the same thing. Furthermore when `.baremetal-arm64-asan-test` appears last in the list of extended jobs, as in the case of the `a630-gles-asan`, the general rules inherited by `.baremetal-arm64-asan-test` override the more specific driver rules and prevent the driver job from appearing in the merge pipeline. Simply bumping the `.baremetal-arm64-asan-test` job back earlier in the list of extended jobs would allow the driver rules to take precedence but then the S3_ARTIFACT_NAME, provided by `.baremetal-arm64-asan-test`, which is specific for asan builds, is overridden. By removing the inherited jobs from the `.baremetal-arm64-asan-test`, this job can continue to provide the asan artifact without interfering with the driver jobs appearing in the merge pipeline. Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index d886f5cf737..095424ba632 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -241,9 +241,6 @@ yaml-toml-shell-test: - !reference [.required-for-hardware-jobs, needs] .baremetal-arm64-asan-test: - extends: - - .baremetal-test - - .use-debian/baremetal_arm64_test variables: DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so" S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized