From 9fdefa6182a12a9b4b352fca5530fdd7b284ce4e Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 7 Jul 2022 11:39:49 -0700 Subject: [PATCH] ci: Remove .build-rules from core test job definitions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If you accidentally re-included your test job core definition after your driver-specific ruleset, you'd end up running the driver job on every source code change. This had happened with a630_gles_asan: it included .baremetal-test-arm64-asan (and thus .baremetal-test) after including .a630-test, to override .baremetal-test-arm64's depednencies to use asan artifacts instead. Acked-by: Michel Dänzer Part-of: --- .gitlab-ci/lava/lava-gitlab-ci.yml | 2 -- .gitlab-ci/test/gitlab-ci.yml | 3 --- 2 files changed, 5 deletions(-) diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 91fd2a09f8e..ef73ab18e9c 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -1,6 +1,4 @@ .lava-test: - extends: - - .build-rules # Cancel job if a newer commit is pushed to the same branch interruptible: true variables: diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 780cf667c4c..c05c0b49d1b 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -1,6 +1,4 @@ .test: - extends: - - .build-rules # Cancel job if a newer commit is pushed to the same branch interruptible: true variables: @@ -116,7 +114,6 @@ .baremetal-test: extends: - - .build-rules - .test # Cancel job if a newer commit is pushed to the same branch interruptible: true