From 14f929035f052a3859ae60e7341633da191c6d3d Mon Sep 17 00:00:00 2001 From: Deborah Brouwer Date: Mon, 4 Nov 2024 12:13:15 -0800 Subject: [PATCH] ci: simplify .baremetal-arm32-asan-test The `.baremetal-arm32-asan-test` job extends `.baremetal-test` and `.use-debian/baremetal_arm32_test` but doing this is unnecessary because the only job that extends `.baremetal-arm32-asan-test`, i.e. `gc2000-gles2-asan`, also indirectly inherits `.baremetal-test-arm32` which does the same thing. Duplicating the extended jobs in `.baremetal-arm32-asan-test` can unnecessarily cause rule overrides and unexpectedly remove jobs from pipelines. Remove the inherited jobs from the `.baremetal-arm32-asan-test` job so that (when the necessary farm is enabled) `gc2000-gles2-asan` will appear in pipelines as expected. 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 ca845027865..d886f5cf737 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -231,9 +231,6 @@ yaml-toml-shell-test: # ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build .baremetal-arm32-asan-test: - extends: - - .baremetal-test - - .use-debian/baremetal_arm32_test variables: DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so" S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized