Commit 7a66da5e authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch '213705-stop-running-quarantined-specs' into 'master'

Stop running quarantined specs

Closes #213705

See merge request gitlab-org/gitlab!29344
parents 93d29d34 77c766b4
...@@ -93,17 +93,6 @@ downtime_check: ...@@ -93,17 +93,6 @@ downtime_check:
reports: reports:
junit: junit_rspec.xml junit: junit_rspec.xml
.rspec-base-quarantine-pg11:
extends:
- .rspec-base
- .use-pg11
variables:
RSPEC_OPTS: "--tag quarantine -- spec/"
script:
- source scripts/rspec_helpers.sh
- rspec_simple_job "${RSPEC_OPTS}"
allow_failure: true
.rspec-base-pg11: .rspec-base-pg11:
extends: extends:
- .rspec-base - .rspec-base
...@@ -247,11 +236,6 @@ rspec:coverage: ...@@ -247,11 +236,6 @@ rspec:coverage:
#################### ####################
# master-only jobs # # master-only jobs #
rspec quarantine pg11:
extends:
- .rspec-base-quarantine-pg11
- .rails:rules:master-refs-code-backstage
.rspec-base-pg10: .rspec-base-pg10:
extends: extends:
- .rspec-base - .rspec-base
...@@ -310,13 +294,6 @@ rspec system pg9: ...@@ -310,13 +294,6 @@ rspec system pg9:
####################### #######################
# EE master-only jobs # # EE master-only jobs #
rspec-ee quarantine pg11:
extends:
- .rspec-base-quarantine-pg11
- .rails:rules:master-refs-code-backstage-ee-only
variables:
RSPEC_OPTS: "--tag quarantine -- ee/spec/"
.rspec-ee-base-pg10: .rspec-ee-base-pg10:
extends: extends:
- .rspec-base-ee - .rspec-base-ee
......
...@@ -363,15 +363,6 @@ ...@@ -363,15 +363,6 @@
when: on_success when: on_success
- changes: [".gitlab/ci/rails.gitlab-ci.yml"] - changes: [".gitlab/ci/rails.gitlab-ci.yml"]
.rails:rules:master-refs-code-backstage-ee-only:
rules:
- <<: *if-not-ee
when: never
- <<: *if-master-refs
changes: *code-backstage-patterns
when: on_success
- changes: [".gitlab/ci/rails.gitlab-ci.yml"]
.rails:rules:nightly-master-refs-code-backstage: .rails:rules:nightly-master-refs-code-backstage:
rules: rules:
- <<: *if-nightly-master-schedule - <<: *if-nightly-master-schedule
......
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