Commit dcb0e69f authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'default-tags-for-gitlab' into 'master'

Define `tags:` globally for all jobs

See merge request gitlab-org/gitlab!27208
parents ef43ce1d 74b8f6cf
...@@ -12,6 +12,11 @@ stages: ...@@ -12,6 +12,11 @@ stages:
- post-qa - post-qa
- pages - pages
# always use `gitlab-org` runners
default:
tags:
- gitlab-org
workflow: workflow:
rules: rules:
# If `$FORCE_GITLAB_CI` is set, create a pipeline. # If `$FORCE_GITLAB_CI` is set, create a pipeline.
......
.run-dev-fixtures: .run-dev-fixtures:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
......
.review-docs: .review-docs:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .docs:rules:review-docs - .docs:rules:review-docs
allow_failure: true allow_failure: true
...@@ -42,7 +41,6 @@ review-docs-cleanup: ...@@ -42,7 +41,6 @@ review-docs-cleanup:
docs lint: docs lint:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .docs:rules:docs-lint - .docs:rules:docs-lint
image: "registry.gitlab.com/gitlab-org/gitlab-docs:lint" image: "registry.gitlab.com/gitlab-org/gitlab-docs:lint"
...@@ -64,7 +62,6 @@ docs lint: ...@@ -64,7 +62,6 @@ docs lint:
graphql-reference-verify: graphql-reference-verify:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
.gitlab:assets:compile-metadata: .gitlab:assets:compile-metadata:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-before_script - .default-before_script
- .assets-compile-cache - .assets-compile-cache
...@@ -64,7 +63,6 @@ gitlab:assets:compile pull-cache: ...@@ -64,7 +63,6 @@ gitlab:assets:compile pull-cache:
.compile-assets-metadata: .compile-assets-metadata:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-before_script - .default-before_script
- .assets-compile-cache - .assets-compile-cache
...@@ -122,7 +120,6 @@ compile-assets pull-cache as-if-foss: ...@@ -122,7 +120,6 @@ compile-assets pull-cache as-if-foss:
.frontend-fixtures-base: .frontend-fixtures-base:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
...@@ -160,7 +157,6 @@ frontend-fixtures-as-if-foss: ...@@ -160,7 +157,6 @@ frontend-fixtures-as-if-foss:
.frontend-job-base: .frontend-job-base:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
...@@ -242,7 +238,6 @@ jest-as-if-foss: ...@@ -242,7 +238,6 @@ jest-as-if-foss:
coverage-frontend: coverage-frontend:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .frontend:rules:default-frontend-jobs - .frontend:rules:default-frontend-jobs
needs: ["jest"] needs: ["jest"]
...@@ -262,7 +257,6 @@ coverage-frontend: ...@@ -262,7 +257,6 @@ coverage-frontend:
.qa-frontend-node: .qa-frontend-node:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .frontend:rules:qa-frontend-node - .frontend:rules:qa-frontend-node
...@@ -290,7 +284,6 @@ qa-frontend-node:latest: ...@@ -290,7 +284,6 @@ qa-frontend-node:latest:
webpack-dev-server: webpack-dev-server:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .frontend:rules:default-frontend-jobs - .frontend:rules:default-frontend-jobs
......
.default-tags:
tags:
- gitlab-org
.default-retry: .default-retry:
retry: retry:
max: 2 # This is confusing but this means "3 runs at max". max: 2 # This is confusing but this means "3 runs at max".
......
.only-code-memory-job-base: .only-code-memory-job-base:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
......
pages: pages:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .pages:rules - .pages:rules
......
.qa-job-base: .qa-job-base:
extends: extends:
- .default-tags
- .default-retry - .default-retry
stage: test stage: test
needs: [] needs: []
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
.rails-job-base: .rails-job-base:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
......
.review-docker: .review-docker:
extends: extends:
- .default-tags
- .default-retry - .default-retry
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6 image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6
services: services:
...@@ -29,7 +28,6 @@ build-qa-image: ...@@ -29,7 +28,6 @@ build-qa-image:
review-cleanup: review-cleanup:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .review:rules:review-cleanup - .review:rules:review-cleanup
stage: prepare stage: prepare
...@@ -46,7 +44,6 @@ review-cleanup: ...@@ -46,7 +44,6 @@ review-cleanup:
review-build-cng: review-build-cng:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .review:rules:mr-and-schedule - .review:rules:mr-and-schedule
image: ruby:2.6-alpine image: ruby:2.6-alpine
...@@ -63,7 +60,6 @@ review-build-cng: ...@@ -63,7 +60,6 @@ review-build-cng:
.review-workflow-base: .review-workflow-base:
extends: extends:
- .default-tags
- .default-retry - .default-retry
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
variables: variables:
...@@ -217,7 +213,6 @@ review-performance: ...@@ -217,7 +213,6 @@ review-performance:
parallel-spec-reports: parallel-spec-reports:
extends: extends:
- .default-tags
- .review:rules:mr-only-manual - .review:rules:mr-only-manual
image: ruby:2.6-alpine image: ruby:2.6-alpine
stage: post-qa stage: post-qa
...@@ -244,7 +239,6 @@ parallel-spec-reports: ...@@ -244,7 +239,6 @@ parallel-spec-reports:
danger-review: danger-review:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .review:rules:danger - .review:rules:danger
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# rubygems.org in the future. # rubygems.org in the future.
cache gems: cache gems:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
...@@ -21,7 +20,6 @@ cache gems: ...@@ -21,7 +20,6 @@ cache gems:
.minimal-job: .minimal-job:
extends: extends:
- .default-tags
- .default-retry - .default-retry
needs: [] needs: []
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# This uses rules from project root `.yamllint`. # This uses rules from project root `.yamllint`.
lint-ci-gitlab: lint-ci-gitlab:
extends: extends:
- .default-tags
- .default-retry - .default-retry
- .yaml:rules - .yaml:rules
image: sdesbure/yamllint:latest image: sdesbure/yamllint:latest
......
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