From d13ea54a0e30d6b8cc841249b901916e54262cee Mon Sep 17 00:00:00 2001
From: David Dieulivol <ddieulivol@gitlab.com>
Date: Wed, 17 Apr 2024 19:00:16 +0000
Subject: [PATCH] Rename CI rule for consistency
All other as-if-foss CI rules have a "-as-if-foss" suffix, and not
":as-if-foss"
---
.gitlab/ci/frontend.gitlab-ci.yml | 2 +-
.gitlab/ci/rules.gitlab-ci.yml | 32 ++++++++-----------------------
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index fd7f22456539d..ff0c0b40a5e49 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -294,7 +294,7 @@ jest predictive:
jest predictive as-if-foss:
extends:
- .jest-base
- - .frontend:rules:jest:predictive:as-if-foss
+ - .frontend:rules:jest:predictive-as-if-foss
- .as-if-foss
needs:
- "rspec-all frontend_fixture as-if-foss"
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index b4e061e5ec4c0..7c28b1521f878 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -406,16 +406,8 @@
.frontend-predictive-patterns: &frontend-predictive-patterns
- "{,ee/,jh/}{app/assets/javascripts,spec/frontend}/**/*"
-.frontend-patterns-for-as-if-foss: &frontend-patterns-for-as-if-foss
- - "{package.json,yarn.lock}"
- - ".browserslistrc"
- - "babel.config.js"
- - "jest.config.{base,integration,unit}.js"
- - ".stylelintrc"
- - "Dockerfile.assets"
- - "config/**/*.js"
- - "vendor/assets/**/*"
- - "{app/assets,app/components,app/helpers,app/presenters,app/views,locale,public,spec/frontend,storybook,symbol}/**/*"
+.frontend-predictive-patterns-as-if-foss: &frontend-predictive-patterns-as-if-foss
+ - "{app/assets/javascripts,spec/frontend}/**/*"
# Frontend view patterns + .qa-patterns
.frontend-qa-patterns: &frontend-qa-patterns
@@ -1328,26 +1320,19 @@
- <<: *if-default-refs
changes: *code-backstage-patterns
-.frontend:rules:default-frontend-jobs-as-if-foss:
+.frontend:rules:frontend_fixture-as-if-foss:
rules:
- !reference [".strict-ee-only-rules", rules]
- <<: *if-merge-request-labels-pipeline-expedite
when: never
- - <<: *if-security-merge-request
- changes: *code-backstage-patterns
- <<: *if-merge-request-labels-as-if-foss
- <<: *if-merge-request-labels-run-all-rspec
- - <<: *if-merge-request
- changes: *frontend-patterns-for-as-if-foss
-
-.frontend:rules:frontend_fixture-as-if-foss:
- rules:
- - !reference [".strict-ee-only-rules", rules]
- - !reference [".frontend:rules:default-frontend-jobs-as-if-foss", rules]
- <<: *if-merge-request-labels-run-all-jest
- <<: *if-merge-request-labels-frontend-and-feature-flag
+ - <<: *if-security-merge-request
+ changes: *code-backstage-patterns
- <<: *if-merge-request
- changes: *frontend-patterns-for-as-if-foss
+ changes: *frontend-predictive-patterns-as-if-foss
.frontend:rules:upload-frontend-fixtures:
rules:
@@ -1425,7 +1410,7 @@
- <<: *if-default-refs
changes: *code-backstage-patterns
-.frontend:rules:jest:predictive:as-if-foss:
+.frontend:rules:jest:predictive-as-if-foss:
rules:
- !reference [".strict-ee-only-rules", rules]
- !reference [".frontend:rules:predictive-default-rules", rules]
@@ -1437,7 +1422,7 @@
- <<: *if-fork-merge-request
when: never
- <<: *if-merge-request
- changes: *frontend-patterns-for-as-if-foss
+ changes: *frontend-predictive-patterns-as-if-foss
.frontend:rules:coverage-frontend:
rules:
@@ -2991,7 +2976,6 @@
# .build-images:rules:build-qa-image-merge-requests
# .build-images:rules:build-assets-image
# .frontend:rules:compile-production-assets
-# .frontend:rules:default-frontend-jobs-as-if-foss
# .rails:rules:single-db
# .rails:rules:single-db-ci-connection
# .rails:rules:single-redis
--
GitLab