From a27e3e86e939a05c3fff0a278fb4b228bafbe143 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Tue, 2 Apr 2024 10:04:15 +0200
Subject: [PATCH] Always run tooling specs for all changes
---
.gitlab/ci/rails.gitlab-ci.yml | 1 -
.gitlab/ci/rules.gitlab-ci.yml | 22 +++-------------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 7ee736dd35b2e..08b2077969418 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -325,7 +325,6 @@ rspec fast_spec_helper:
rspec tooling:
extends:
- .rspec-base-pg14
- - .rails:rules:tooling
rspec unit clickhouse:
extends:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 810cc88a81ecc..8f4d4ec8b0ffa 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -410,9 +410,6 @@
- "{,ee/,jh/}fixtures/**/*"
- "{,ee/,jh/}rubocop/**/*"
- "{,ee/,jh/}spec/**/*"
-
-.tooling-patterns: &tooling-patterns
- - "spec/dot_gitlab_ci/**/*"
- "{,spec/}tooling/**/*"
.qa-patterns: &qa-patterns
@@ -481,6 +478,7 @@
- "{,ee/,jh/}fixtures/**/*"
- "{,ee/,jh/}rubocop/**/*"
- "{,ee/,jh/}spec/**/*"
+ - "{,spec/}tooling/**/*"
# .code-patterns + .qa-patterns
.code-qa-patterns: &code-qa-patterns
@@ -538,6 +536,7 @@
- "{,ee/,jh/}fixtures/**/*"
- "{,ee/,jh/}rubocop/**/*"
- "{,ee/,jh/}spec/**/*"
+ - "{,spec/}tooling/**/*"
# QA changes
- ".dockerignore"
- "{,jh/}qa/**/*"
@@ -578,6 +577,7 @@
- "{,ee/,jh/}fixtures/**/*"
- "{,ee/,jh/}rubocop/**/*"
- "{,ee/,jh/}spec/**/*"
+ - "{,spec/}tooling/**/*"
# QA changes
- ".dockerignore"
- "{,jh/}qa/**/*"
@@ -680,8 +680,6 @@
- <<: *if-merge-request-labels-run-all-rspec
- <<: *if-merge-request
changes: *core-backend-patterns
- - <<: *if-merge-request
- changes: *tooling-patterns
- <<: *if-automated-merge-request
changes: *backend-patterns
- <<: *if-security-merge-request
@@ -1958,9 +1956,6 @@
- <<: *if-merge-request
changes: *core-backend-patterns
when: never
- - <<: *if-merge-request
- changes: *tooling-patterns
- when: never
- <<: *if-automated-merge-request
changes: *backend-patterns
when: never
@@ -2048,14 +2043,6 @@
- <<: *if-default-refs
changes: *core-backend-patterns
-.rails:rules:tooling:
- rules:
- - <<: *if-merge-request-labels-run-all-rspec
- - <<: *if-merge-request
- changes: *tooling-patterns
- - <<: *if-default-refs
- changes: *tooling-patterns
-
.rails:rules:code-backstage-qa:
rules:
- <<: *if-default-refs
@@ -2221,9 +2208,6 @@
when: never
- <<: *if-merge-request-labels-pipeline-expedite
when: never
- - <<: *if-merge-request
- changes: *tooling-patterns
- when: never
- <<: *if-security-merge-request
changes: *code-backstage-patterns
- <<: *if-dot-com-gitlab-org-merge-request
--
GitLab