Run full rspec jobs before and after approval
What does this MR do and why?
This MR runs rspec full jobs instead of rspecs minimal jobs before approvals. The goal is to temporarily reduce the likelihood of a broken master from minimal pipelines until we can confirm and resolve the below behavior @kwiebers summarized in #373064 (closed):
rspecandjestfull jobs do not appear to be running in pipelines unless Code Owner approval is satisfied. This normally comes at the end of the MR and carries a risk of increasing rate of broken master due to the minimal transition success rate forrspec. That success rate indicates that minimal pipelines will pass 5-30% of the time when the full pipeline fails.
Testing
Tested this MR's change by making the below file changes in !97429 (closed).
| Changes | Pipeline (Before Approval) | Pipeline (After Approval) |
|---|---|---|
app/models/ci/pipeline.rb (f3cabfbb) |
rspec full jobs are created in pipelines/635180149
|
rspec full jobs are created in pipelines/635202065
|
Also, I compared the merged YAMLs between master and this branch to ensure there's no changes of jest full and minimal job triggers as we're planning to run jest minimal job before and after approval in #372479 (closed)
View merged YAML diff
diff --git a/merged_yaml_master.yml b/merged_yaml_373064-run-full-rspec-jobs.yml
index 9ff5ce6ebf7..6055f30b101 100644
--- a/merged_yaml_master.yml
+++ b/merged_yaml_373064-run-full-rspec-jobs.yml
@@ -4568,8 +4568,6 @@ e2e:package-and-test:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -5411,8 +5409,6 @@ e2e:package-and-test:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -5939,8 +5935,6 @@ rspec migration pg12:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -6056,6 +6050,8 @@ rspec migration pg12 minimal:
- ".gitlab/ci/**/*"
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -6390,8 +6386,6 @@ rspec unit pg12:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -6499,6 +6493,8 @@ rspec unit pg12 minimal:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -6828,8 +6824,6 @@ rspec integration pg12:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -6937,6 +6931,8 @@ rspec integration pg12 minimal:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -7298,8 +7294,6 @@ rspec system pg12:
- "{,ee/,jh/}spec/**/*"
- "{,spec/}tooling/**/*"
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{package.json,yarn.lock}"
- ".browserslistrc"
@@ -7434,6 +7428,8 @@ rspec system pg12 minimal:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -7929,8 +7925,6 @@ db:rollback:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -8132,8 +8126,6 @@ db:migrate:reset:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -8342,8 +8334,6 @@ db:migrate-from-previous-major-version:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -9106,8 +9096,6 @@ gitlab:setup:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -9826,8 +9814,6 @@ rspec migration pg12-as-if-foss:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
parallel: 12
rspec migration pg12-as-if-foss minimal:
retry:
@@ -9912,6 +9898,8 @@ rspec migration pg12-as-if-foss minimal:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -10167,8 +10155,6 @@ rspec unit pg12-as-if-foss:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- if: "$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/"
changes:
- "{,jh/}Gemfile{,.lock}"
@@ -10269,6 +10255,8 @@ rspec unit pg12-as-if-foss minimal:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -10519,8 +10507,6 @@ rspec integration pg12-as-if-foss:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- if: "$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/"
changes:
- "{,jh/}Gemfile{,.lock}"
@@ -10621,6 +10607,8 @@ rspec integration pg12-as-if-foss minimal:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -10902,8 +10890,6 @@ rspec system pg12-as-if-foss:
- "{,ee/,jh/}spec/**/*"
- "{,spec/}tooling/**/*"
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- if: "$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/"
changes:
- "{package.json,yarn.lock}"
@@ -11017,6 +11003,8 @@ rspec system pg12-as-if-foss minimal:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -11315,8 +11303,6 @@ rspec-ee migration pg12:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -11423,6 +11409,8 @@ rspec-ee migration pg12 minimal:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -11692,8 +11680,6 @@ rspec-ee unit pg12:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -11989,6 +11975,8 @@ rspec-ee unit pg12 minimal:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -12253,8 +12241,6 @@ rspec-ee integration pg12:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -12550,6 +12536,8 @@ rspec-ee integration pg12 minimal:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -12845,8 +12833,6 @@ rspec-ee system pg12:
- "{,ee/,jh/}spec/**/*"
- "{,spec/}tooling/**/*"
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{package.json,yarn.lock}"
- ".browserslistrc"
@@ -13168,6 +13154,8 @@ rspec-ee system pg12 minimal:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -13419,8 +13407,6 @@ db:rollback geo:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -17603,6 +17589,8 @@ danger-review-local:
rules:
- if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
=~ /stable-ee$/
when: never
@@ -17656,8 +17644,6 @@ danger-review-local:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
".rails:rules:as-if-foss-migration-unit-integration:minimal-default-rules":
rules:
- if: "$CI_MERGE_REQUEST_IID"
@@ -17756,8 +17742,6 @@ danger-review-local:
- "{,ee/,jh/}spec/**/*"
- "{,spec/}tooling/**/*"
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
".rails:rules:system:minimal-default-rules":
rules:
- if: "$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-rspec/"
@@ -18084,6 +18068,15 @@ danger-review-local:
- ".dockerignore"
- "{,jh/}qa/**/*"
- data/whats_new/*.yml
+".frontend:rules:minimal-default-rules":
+ rules:
+ - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
+ when: never
+ - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+ =~ /stable-ee$/
+ when: never
+ - if: $CI_PROJECT_NAMESPACE == "gitlab-org/security" && $CI_MERGE_REQUEST_IID
+ when: never
".frontend:rules:compile-production-assets":
rules:
- if: "$CI_PROJECT_NAMESPACE !~ /^gitlab(-org)?($|\\/)/"
@@ -19086,8 +19079,6 @@ danger-review-local:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -19126,6 +19117,8 @@ danger-review-local:
- ".gitlab/ci/**/*"
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -19246,8 +19239,6 @@ danger-review-local:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -19278,6 +19269,8 @@ danger-review-local:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -19351,8 +19344,6 @@ danger-review-local:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -19383,6 +19374,8 @@ danger-review-local:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -19487,8 +19480,6 @@ danger-review-local:
- "{,ee/,jh/}spec/**/*"
- "{,spec/}tooling/**/*"
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{package.json,yarn.lock}"
- ".browserslistrc"
@@ -19545,6 +19536,8 @@ danger-review-local:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -19711,8 +19704,6 @@ danger-review-local:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
- "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/database/**/*"
@@ -19735,6 +19726,8 @@ danger-review-local:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -19815,8 +19808,6 @@ danger-review-local:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -19849,6 +19840,8 @@ danger-review-local:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -19924,8 +19917,6 @@ danger-review-local:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{,jh/}Gemfile{,.lock}"
- Rakefile
@@ -19958,6 +19949,8 @@ danger-review-local:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -20064,8 +20057,6 @@ danger-review-local:
- "{,ee/,jh/}spec/**/*"
- "{,spec/}tooling/**/*"
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- changes:
- "{package.json,yarn.lock}"
- ".browserslistrc"
@@ -20124,6 +20115,8 @@ danger-review-local:
- data/whats_new/*.yml
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -20240,14 +20233,14 @@ danger-review-local:
- lib/gitlab/setup_helper.rb
- ".gitlab-ci.yml"
- ".gitlab/ci/**/*"
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
".rails:rules:as-if-foss-migration:minimal":
rules:
- if: "$CI_PROJECT_NAME !~ /^gitlab(-ee)?$/"
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -20326,8 +20319,6 @@ danger-review-local:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- if: "$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/"
changes:
- "{,jh/}Gemfile{,.lock}"
@@ -20350,6 +20341,8 @@ danger-review-local:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -20423,8 +20416,6 @@ danger-review-local:
- "*_VERSION"
- scripts/rspec_helpers.sh
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- if: "$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/"
changes:
- "{,jh/}Gemfile{,.lock}"
@@ -20447,6 +20438,8 @@ danger-review-local:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: never
@@ -20551,8 +20544,6 @@ danger-review-local:
- "{,ee/,jh/}spec/**/*"
- "{,spec/}tooling/**/*"
- data/whats_new/*.yml
- - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
- when: never
- if: "$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/"
changes:
- "{package.json,yarn.lock}"
@@ -20588,6 +20579,8 @@ danger-review-local:
when: never
- - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED"
when: never
+ - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED != "true"
+ when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" ||
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/
when: neverScreenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Related to #373064 (closed)
Edited by Nao Hashizume