Commit 5ebaafc3 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch '41139-codequality-and-qa-internal-is-leaking-to-shared-runners' into 'master'

Resolve "Codequality and qa:internal is leaking to Shared Runners"

Closes #41139

See merge request gitlab-org/gitlab-ce!15957
parents 130b03c2 2afb6cbf
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6" image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6"
.dedicated-runner: &dedicated-runner
retry: 1
tags:
- gitlab-org
.default-cache: &default-cache .default-cache: &default-cache
key: "ruby-235-with-yarn" key: "ruby-235-with-yarn"
paths: paths:
...@@ -42,11 +47,6 @@ stages: ...@@ -42,11 +47,6 @@ stages:
- post-cleanup - post-cleanup
# Predefined scopes # Predefined scopes
.dedicated-runner: &dedicated-runner
retry: 1
tags:
- gitlab-org
.tests-metadata-state: &tests-metadata-state .tests-metadata-state: &tests-metadata-state
<<: *dedicated-runner <<: *dedicated-runner
variables: variables:
...@@ -82,9 +82,9 @@ stages: ...@@ -82,9 +82,9 @@ stages:
.rspec-metadata: &rspec-metadata .rspec-metadata: &rspec-metadata
<<: *dedicated-runner <<: *dedicated-runner
<<: *pull-cache
<<: *except-docs <<: *except-docs
<<: *except-qa <<: *except-qa
<<: *pull-cache
stage: test stage: test
script: script:
- JOB_NAME=( $CI_JOB_NAME ) - JOB_NAME=( $CI_JOB_NAME )
...@@ -121,9 +121,9 @@ stages: ...@@ -121,9 +121,9 @@ stages:
.spinach-metadata: &spinach-metadata .spinach-metadata: &spinach-metadata
<<: *dedicated-runner <<: *dedicated-runner
<<: *pull-cache
<<: *except-docs <<: *except-docs
<<: *except-qa <<: *except-qa
<<: *pull-cache
stage: test stage: test
script: script:
- JOB_NAME=( $CI_JOB_NAME ) - JOB_NAME=( $CI_JOB_NAME )
...@@ -162,6 +162,7 @@ stages: ...@@ -162,6 +162,7 @@ stages:
# Trigger a package build in omnibus-gitlab repository # Trigger a package build in omnibus-gitlab repository
# #
package-qa: package-qa:
<<: *dedicated-runner
image: ruby:2.4-alpine image: ruby:2.4-alpine
before_script: [] before_script: []
stage: build stage: build
...@@ -175,6 +176,7 @@ package-qa: ...@@ -175,6 +176,7 @@ package-qa:
# Review docs base # Review docs base
.review-docs: &review-docs .review-docs: &review-docs
<<: *dedicated-runner
<<: *except-qa <<: *except-qa
image: ruby:2.4-alpine image: ruby:2.4-alpine
before_script: before_script:
...@@ -284,9 +286,9 @@ flaky-examples-check: ...@@ -284,9 +286,9 @@ flaky-examples-check:
- scripts/detect-new-flaky-examples $NEW_FLAKY_SPECS_REPORT - scripts/detect-new-flaky-examples $NEW_FLAKY_SPECS_REPORT
setup-test-env: setup-test-env:
<<: *use-pg
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *use-pg
stage: prepare stage: prepare
cache: cache:
<<: *default-cache <<: *default-cache
...@@ -375,19 +377,19 @@ spinach-mysql 3 4: *spinach-metadata-mysql ...@@ -375,19 +377,19 @@ spinach-mysql 3 4: *spinach-metadata-mysql
SETUP_DB: "false" SETUP_DB: "false"
.rake-exec: &rake-exec .rake-exec: &rake-exec
<<: *ruby-static-analysis
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa <<: *except-qa
<<: *pull-cache <<: *pull-cache
<<: *ruby-static-analysis
stage: test stage: test
script: script:
- bundle exec rake $CI_JOB_NAME - bundle exec rake $CI_JOB_NAME
static-analysis: static-analysis:
<<: *ruby-static-analysis
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *ruby-static-analysis
stage: test stage: test
script: script:
- scripts/static-analysis - scripts/static-analysis
...@@ -456,11 +458,17 @@ db:migrate:reset-mysql: ...@@ -456,11 +458,17 @@ db:migrate:reset-mysql:
<<: *db-migrate-reset <<: *db-migrate-reset
<<: *use-mysql <<: *use-mysql
db:check-schema-pg:
<<: *db-migrate-reset
<<: *use-pg
script:
- source scripts/schema_changed.sh
.migration-paths: &migration-paths .migration-paths: &migration-paths
<<: *dedicated-runner <<: *dedicated-runner
<<: *pull-cache
<<: *except-docs <<: *except-docs
<<: *except-qa <<: *except-qa
<<: *pull-cache
stage: test stage: test
variables: variables:
SETUP_DB: "false" SETUP_DB: "false"
...@@ -530,12 +538,6 @@ db:seed_fu-mysql: ...@@ -530,12 +538,6 @@ db:seed_fu-mysql:
<<: *db-seed_fu <<: *db-seed_fu
<<: *use-mysql <<: *use-mysql
db:check-schema-pg:
<<: *db-migrate-reset
<<: *use-pg
script:
- source scripts/schema_changed.sh
# Frontend-related jobs # Frontend-related jobs
gitlab:assets:compile: gitlab:assets:compile:
<<: *dedicated-runner <<: *dedicated-runner
...@@ -561,11 +563,11 @@ gitlab:assets:compile: ...@@ -561,11 +563,11 @@ gitlab:assets:compile:
- webpack-report/ - webpack-report/
karma: karma:
<<: *use-pg
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa <<: *except-qa
<<: *pull-cache <<: *pull-cache
<<: *use-pg
stage: test stage: test
variables: variables:
BABEL_ENV: "coverage" BABEL_ENV: "coverage"
...@@ -604,6 +606,7 @@ codequality: ...@@ -604,6 +606,7 @@ codequality:
paths: [codeclimate.json] paths: [codeclimate.json]
qa:internal: qa:internal:
<<: *dedicated-runner
<<: *except-docs <<: *except-docs
stage: test stage: test
variables: variables:
...@@ -695,9 +698,10 @@ cache gems: ...@@ -695,9 +698,10 @@ cache gems:
- master@gitlab-org/gitlab-ee - master@gitlab-org/gitlab-ee
gitlab_git_test: gitlab_git_test:
<<: *pull-cache <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa <<: *except-qa
<<: *pull-cache
variables: variables:
SETUP_DB: "false" SETUP_DB: "false"
script: script:
......
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