Commit 369af359 authored by Albert Salim's avatar Albert Salim

Merge branch 'remove-mentions-of-the-rspec-fails-fast-enabled-variable' into 'master'

Remove mentions of RSPEC_FAIL_FAST_ENABLED/pipeline:skip-rspec-fail-fast

See merge request gitlab-org/gitlab!71043
parents b304c888 549a2ea3
...@@ -89,7 +89,6 @@ variables: ...@@ -89,7 +89,6 @@ variables:
REVIEW_APPS_GCP_REGION: "us-central1" REVIEW_APPS_GCP_REGION: "us-central1"
BUILD_ASSETS_IMAGE: "true" # Set it to "false" to disable assets image building, used in `build-assets-image` BUILD_ASSETS_IMAGE: "true" # Set it to "false" to disable assets image building, used in `build-assets-image`
RSPEC_FAIL_FAST_ENABLED: "true" # Set it to "false" to disable RSpec fail-fast
SIMPLECOV: "true" SIMPLECOV: "true"
# For the default QA image, we use $CI_COMMIT_SHA as tag since it's always available and we override it for specific workflow.rules (see above) # For the default QA image, we use $CI_COMMIT_SHA as tag since it's always available and we override it for specific workflow.rules (see above)
......
...@@ -91,13 +91,6 @@ ...@@ -91,13 +91,6 @@
.if-dot-com-gitlab-org-and-security-tag: &if-dot-com-gitlab-org-and-security-tag .if-dot-com-gitlab-org-and-security-tag: &if-dot-com-gitlab-org-and-security-tag
if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_COMMIT_TAG' if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_COMMIT_TAG'
.if-rspec-fail-fast-disabled: &if-rspec-fail-fast-disabled
if: '$RSPEC_FAIL_FAST_ENABLED != "true"'
.if-rspec-fail-fast-skipped: &if-rspec-fail-fast-skipped
if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:skip-rspec-fail-fast/'
# For Security merge requests, the gitlab-release-tools-bot triggers a new # For Security merge requests, the gitlab-release-tools-bot triggers a new
# pipeline for the "Pipelines for merged results" feature. If the pipeline # pipeline for the "Pipelines for merged results" feature. If the pipeline
# fails, we notify release managers. # fails, we notify release managers.
...@@ -1091,10 +1084,6 @@ ...@@ -1091,10 +1084,6 @@
.rails:rules:rspec fail-fast: .rails:rules:rspec fail-fast:
rules: rules:
- <<: *if-rspec-fail-fast-disabled
when: never
- <<: *if-rspec-fail-fast-skipped
when: never
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
...@@ -1104,10 +1093,6 @@ ...@@ -1104,10 +1093,6 @@
.rails:rules:fail-pipeline-early: .rails:rules:fail-pipeline-early:
rules: rules:
- <<: *if-rspec-fail-fast-disabled
when: never
- <<: *if-rspec-fail-fast-skipped
when: never
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment