Commit c868784e authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch...

Merge branch '7455-update-tests-metadata-is-broken-since-https-gitlab-com-gitlab-org-gitlab-ee-merge_requests-7207' into 'master'

Resolve "update-tests-metadata is broken since https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7207"

Closes #7455

See merge request gitlab-org/gitlab-ee!7239
parents 0badc71a e98230d1
...@@ -240,9 +240,6 @@ stages: ...@@ -240,9 +240,6 @@ stages:
- cp ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH} - cp ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
- knapsack rspec "-Ispec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag ~geo" - knapsack rspec "-Ispec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag ~geo"
artifacts:
reports:
junit: junit_rspec.xml
.rspec-ee-pg: &rspec-ee-pg .rspec-ee-pg: &rspec-ee-pg
<<: *rspec-metadata-ee <<: *rspec-metadata-ee
...@@ -262,9 +259,6 @@ stages: ...@@ -262,9 +259,6 @@ stages:
- source scripts/prepare_postgres_fdw.sh - source scripts/prepare_postgres_fdw.sh
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
- bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/ - bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/
artifacts:
reports:
junit: junit_rspec.xml
.rspec-geo-pg-10-2: &rspec-metadata-pg-geo-10-2 .rspec-geo-pg-10-2: &rspec-metadata-pg-geo-10-2
<<: *rspec-metadata <<: *rspec-metadata
...@@ -276,9 +270,6 @@ stages: ...@@ -276,9 +270,6 @@ stages:
- source scripts/prepare_postgres_fdw.sh - source scripts/prepare_postgres_fdw.sh
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
- bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/ - bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/
artifacts:
reports:
junit: junit_rspec.xml
.rspec-ee-pg-rails5: &rspec-ee-pg-rails5 .rspec-ee-pg-rails5: &rspec-ee-pg-rails5
<<: *rspec-ee-pg <<: *rspec-ee-pg
......
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