diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 18:08:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 18:08:54 +0300 |
| commit | 11e5d1b9ca3efa7be34ddebb708a6aedb4e91639 (patch) | |
| tree | 999fdffb9d3db2e5200994e289e50fa3a3a1684a /.gitlab | |
| parent | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 3b88dcfe45d..1490338086d 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -75,18 +75,18 @@ changes: *code-backstage-qa-patterns when: on_success -.rails:rules:master-refs-code-backstage-qa: +.rails:rules:master-refs-code-backstage: rules: - <<: *if-master-refs - changes: *code-backstage-qa-patterns + changes: *code-backstage-patterns when: on_success -.rails:rules:master-refs-code-backstage-qa-ee-only: +.rails:rules:master-refs-code-backstage-ee-only: rules: - <<: *if-not-ee when: never - <<: *if-master-refs - changes: *code-backstage-qa-patterns + changes: *code-backstage-patterns when: on_success .rails:rules:ee-only: @@ -332,12 +332,12 @@ coverage: rspec quarantine pg9: extends: - .rspec-base-quarantine - - .rails:rules:master-refs-code-backstage-qa + - .rails:rules:master-refs-code-backstage .rspec-base-pg10: extends: - .rspec-base - - .rails:rules:master-refs-code-backstage-qa + - .rails:rules:master-refs-code-backstage - .use-pg10 rspec unit pg10: @@ -359,7 +359,7 @@ rspec system pg10: rspec-ee quarantine pg9: extends: - .rspec-base-quarantine - - .rails:rules:master-refs-code-backstage-qa-ee-only + - .rails:rules:master-refs-code-backstage-ee-only variables: RSPEC_OPTS: "--tag quarantine -- ee/spec/" @@ -367,25 +367,25 @@ rspec-ee migration pg10: extends: - .rspec-ee-base-pg10 - .rspec-base-migration - - .rails:rules:master-refs-code-backstage-qa + - .rails:rules:master-refs-code-backstage parallel: 2 rspec-ee unit pg10: extends: - .rspec-ee-base-pg10 - - .rails:rules:master-refs-code-backstage-qa + - .rails:rules:master-refs-code-backstage parallel: 10 rspec-ee integration pg10: extends: - .rspec-ee-base-pg10 - - .rails:rules:master-refs-code-backstage-qa + - .rails:rules:master-refs-code-backstage parallel: 3 rspec-ee system pg10: extends: - .rspec-ee-base-pg10 - - .rails:rules:master-refs-code-backstage-qa + - .rails:rules:master-refs-code-backstage parallel: 5 # ee + master-only jobs # ######################### |