diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-11 00:08:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-11 00:08:27 +0300 |
commit | 505a610385ae67b486f05dcd3123b916f616284b (patch) | |
tree | 8b06434bcfd0da2895f76a7a571cd81961d0b8ef /.gitlab | |
parent | 8731954e18e2c5969d4a5f67d187892312c463c4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/caching.gitlab-ci.yml | 1 | ||||
-rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 20 | ||||
-rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 38 |
3 files changed, 37 insertions, 22 deletions
diff --git a/.gitlab/ci/caching.gitlab-ci.yml b/.gitlab/ci/caching.gitlab-ci.yml index ae4bb94b301..96c2b0d9322 100644 --- a/.gitlab/ci/caching.gitlab-ci.yml +++ b/.gitlab/ci/caching.gitlab-ci.yml @@ -45,6 +45,7 @@ cache-assets:test as-if-foss: extends: - .cache-assets-base - .as-if-foss + - .caching:rules:cache-assets-as-if-foss cache-assets:production: extends: diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 86884790ea1..96a5e7ceea3 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -584,25 +584,25 @@ rspec migration pg14-as-if-foss single-db: extends: - rspec migration pg14-as-if-foss - .single-db-rspec - - .rails:rules:single-db + - .rails:rules:single-db-as-if-foss rspec background_migration pg14-as-if-foss single-db: extends: - rspec background_migration pg14-as-if-foss - .single-db-rspec - - .rails:rules:single-db + - .rails:rules:single-db-as-if-foss rspec migration pg14-as-if-foss single-db-ci-connection: extends: - rspec migration pg14-as-if-foss - .single-db-ci-connection-rspec - - .rails:rules:single-db-ci-connection + - .rails:rules:single-db-ci-connection-as-if-foss rspec background_migration pg14-as-if-foss single-db-ci-connection: extends: - rspec background_migration pg14-as-if-foss - .single-db-ci-connection-rspec - - .rails:rules:single-db-ci-connection + - .rails:rules:single-db-ci-connection-as-if-foss rspec unit pg14-as-if-foss: extends: @@ -614,13 +614,13 @@ rspec unit pg14-as-if-foss single-db: extends: - rspec unit pg14-as-if-foss - .single-db-rspec - - .rails:rules:single-db + - .rails:rules:single-db-as-if-foss rspec unit pg14-as-if-foss single-db-ci-connection: extends: - rspec unit pg14-as-if-foss - .single-db-ci-connection-rspec - - .rails:rules:single-db-ci-connection + - .rails:rules:single-db-ci-connection-as-if-foss rspec integration pg14-as-if-foss: extends: @@ -632,13 +632,13 @@ rspec integration pg14-as-if-foss single-db: extends: - rspec integration pg14-as-if-foss - .single-db-rspec - - .rails:rules:single-db + - .rails:rules:single-db-as-if-foss rspec integration pg14-as-if-foss single-db-ci-connection: extends: - rspec integration pg14-as-if-foss - .single-db-ci-connection-rspec - - .rails:rules:single-db-ci-connection + - .rails:rules:single-db-ci-connection-as-if-foss rspec system pg14-as-if-foss: extends: @@ -650,13 +650,13 @@ rspec system pg14-as-if-foss single-db: extends: - rspec system pg14-as-if-foss - .single-db-rspec - - .rails:rules:single-db + - .rails:rules:single-db-as-if-foss rspec system pg14-as-if-foss single-db-ci-connection: extends: - rspec system pg14-as-if-foss - .single-db-ci-connection-rspec - - .rails:rules:single-db-ci-connection + - .rails:rules:single-db-ci-connection-as-if-foss rspec-ee migration pg14: extends: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 1003989a67a..129f82f9165 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -872,6 +872,8 @@ .build-images:rules:build-qa-image-as-if-foss: rules: + - <<: *if-jh + when: never - !reference [".build-images:rules:build-qa-image-merge-requests", "rules"] - <<: *if-default-branch-schedule-nightly variables: @@ -1009,6 +1011,12 @@ when: manual allow_failure: true +.caching:rules:cache-assets-as-if-foss: + rules: + - <<: *if-jh + when: never + - !reference [".caching:rules:cache-assets", "rules"] + .caching:rules:packages-cleanup: rules: # The new strategy to cache assets as generic packages is experimental and can be disabled by removing the `CACHE_ASSETS_AS_PACKAGE` variable @@ -1175,8 +1183,7 @@ .frontend:rules:compile-test-assets-as-if-foss: rules: - - <<: *if-not-ee - when: never + - !reference [".strict-ee-only-rules", rules] - <<: *if-merge-request-labels-as-if-foss - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request-labels-frontend-and-feature-flag @@ -1609,6 +1616,12 @@ changes: *decomposed-db-models-patterns - <<: *if-default-branch-schedule-nightly +.rails:rules:single-db-as-if-foss: + rules: + - <<: *if-jh + when: never + - !reference [".rails:rules:single-db", "rules"] + .rails:rules:db:check-migrations-single-db: rules: - <<: *if-merge-request-labels-run-single-db @@ -1630,6 +1643,12 @@ changes: *decomposed-db-models-patterns - <<: *if-default-branch-schedule-nightly +.rails:rules:single-db-ci-connection-as-if-foss: + rules: + - <<: *if-jh + when: never + - !reference [".rails:rules:single-db-ci-connection", "rules"] + .rails:rules:db:check-migrations-single-db-ci-connection: rules: - <<: *if-merge-request-labels-run-single-db @@ -1825,8 +1844,7 @@ .rails:rules:as-if-foss-migration: rules: - - <<: *if-not-ee - when: never + - !reference [".strict-ee-only-rules", rules] - <<: *if-merge-request-labels-pipeline-expedite when: never - <<: *if-merge-request-labels-run-all-rspec @@ -1851,8 +1869,7 @@ .rails:rules:as-if-foss-unit: rules: - - <<: *if-not-ee - when: never + - !reference [".strict-ee-only-rules", rules] - <<: *if-fork-merge-request when: never - <<: *if-merge-request-labels-pipeline-expedite @@ -1863,8 +1880,7 @@ .rails:rules:as-if-foss-integration: rules: - - <<: *if-not-ee - when: never + - !reference [".strict-ee-only-rules", rules] - <<: *if-fork-merge-request when: never - <<: *if-merge-request-labels-pipeline-expedite @@ -1875,8 +1891,7 @@ .rails:rules:as-if-foss-system: rules: - - <<: *if-not-ee - when: never + - !reference [".strict-ee-only-rules", rules] - <<: *if-fork-merge-request when: never - <<: *if-merge-request-labels-pipeline-expedite @@ -2093,8 +2108,7 @@ .static-analysis:rules:static-analysis-as-if-foss: rules: - - <<: *if-not-ee - when: never + - !reference [".strict-ee-only-rules", rules] - <<: *if-merge-request-labels-as-if-foss changes: *code-backstage-qa-patterns - <<: *if-security-merge-request |