Commit cdaa892d authored by Albert Salim's avatar Albert Salim

Run rspec foss-impact in canonical MR pipelines

parent bbe4e54f
...@@ -92,4 +92,4 @@ webpack-dev-server.json ...@@ -92,4 +92,4 @@ webpack-dev-server.json
/.nvimrc /.nvimrc
.solargraph.yml .solargraph.yml
apollo.config.js apollo.config.js
matching_foss_tests.txt /tmp/matching_foss_tests.txt
...@@ -326,12 +326,12 @@ db:rollback geo: ...@@ -326,12 +326,12 @@ db:rollback geo:
################################################## ##################################################
################################################## ##################################################
# EE: merged result MR pipelines # EE: Canonical MR pipelines
rspec verify-no-ee-in-foss: rspec foss-impact:
extends: extends:
- .rspec-base - .rspec-base
- .as-if-foss - .as-if-foss
- .rails:rules:ee-only - .rails:rules:ee-canonical-mr-only
- .use-pg11 - .use-pg11
script: script:
- git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
...@@ -339,11 +339,11 @@ rspec verify-no-ee-in-foss: ...@@ -339,11 +339,11 @@ rspec verify-no-ee-in-foss:
- run_timed_command "scripts/gitaly-test-build" - run_timed_command "scripts/gitaly-test-build"
- run_timed_command "scripts/gitaly-test-spawn" - run_timed_command "scripts/gitaly-test-spawn"
- source scripts/rspec_helpers.sh - source scripts/rspec_helpers.sh
- scripts/find_foss_tests matching_foss_tests.txt - scripts/find_foss_tests tmp/matching_foss_tests.txt
- rspec_simple_job "--tag ~quarantine --tag ~geo --tag ~level:migration $(cat matching_foss_tests.txt)" - rspec_simple_job "--tag ~quarantine --tag ~geo --tag ~level:migration $(cat tmp/matching_foss_tests.txt)"
artifacts: artifacts:
expire_in: 7d expire_in: 7d
paths: paths:
- matching_foss_tests.txt - tmp/matching_foss_tests.txt
# EE: merged result MR pipelines # EE: Merge Request pipelines
################################################## ##################################################
...@@ -446,6 +446,15 @@ ...@@ -446,6 +446,15 @@
- <<: *if-master-refs - <<: *if-master-refs
changes: *code-backstage-patterns changes: *code-backstage-patterns
.rails:rules:ee-canonical-mr-only:
rules:
- <<: *if-not-ee
when: never
- <<: *if-not-canonical-namespace
when: never
- <<: *if-merge-request
changes: *code-backstage-patterns
.rails:rules:downtime_check: .rails:rules:downtime_check:
rules: rules:
- <<: *if-merge-request - <<: *if-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