Skip to content
Snippets Groups Projects
Verified Commit 0b85630e authored by Amy Qualls's avatar Amy Qualls :leopard:
Browse files

Fix spacing warnings in YAML files 

These files all had spacing or indentation warnings, which makes it
tough to see the actual errors when they happen. Let's clean up the
output a bit.
parent 041611aa
No related branches found
No related tags found
1 merge request!136507Fix spacing warnings in YAML files
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 44 deletions
.gitlab/ci/database.gitlab-ci.yml
+ 1
− 1
View file @ 0b85630e
......@@ -72,7 +72,7 @@ db:check-schema-single-db:
db:check-migrations:
extends:
- .db-job-base
- .use-pg14 # Should match the db same version used by GDK
- .use-pg14 # Should match the db same version used by GDK
- .rails:rules:ee-and-foss-mr-with-migration
script:
- git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME --depth 20
......
.gitlab/ci/frontend.gitlab-ci.yml
+ 1
− 1
View file @ 0b85630e
......@@ -67,7 +67,7 @@ compile-test-assets:
paths:
- public/assets/
- node_modules/@gitlab/svgs/dist/icons.json # app/helpers/icons_helper.rb uses this file
- node_modules/@gitlab/svgs/dist/file_icons/file_icons.json # app/helpers/icons_helper.rb uses this file
- node_modules/@gitlab/svgs/dist/file_icons/file_icons.json # app/helpers/icons_helper.rb uses this file
- "${WEBPACK_COMPILE_LOG_PATH}"
when: always
......
.gitlab/ci/global.gitlab-ci.yml
+ 4
− 4
View file @ 0b85630e
......@@ -36,7 +36,7 @@
.ruby-gems-cache-push: &ruby-gems-cache-push
<<: *ruby-gems-cache
policy: push # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
policy: push # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
.ruby-coverage-gems-cache: &ruby-coverage-gems-cache
key: "ruby-coverage-gems-debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}"
......@@ -46,7 +46,7 @@
.ruby-coverage-gems-cache-push: &ruby-coverage-gems-cache-push
<<: *ruby-coverage-gems-cache
policy: push # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
policy: push # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
.gitaly-binaries-cache: &gitaly-binaries-cache
key:
......@@ -229,7 +229,7 @@
.redis-services:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
alias: rediscluster # configure connections in config/redis.yml
alias: rediscluster # configure connections in config/redis.yml
- name: redis:${REDIS_VERSION}-alpine
.pg-base-variables:
......@@ -499,7 +499,7 @@
.fast-no-clone-job:
variables:
GIT_STRATEGY: none # We will download the required files for the job from the API
GIT_STRATEGY: none # We will download the required files for the job from the API
before_script:
# Logic taken from scripts/utils.sh in download_files function
- |
......
.gitlab/ci/rails.gitlab-ci.yml
+ 24
− 24
View file @ 0b85630e
......@@ -61,7 +61,7 @@ update-ruby-gems-coverage-cache-push:
- .ruby-gems-coverage-cache-push
- .shared:rules:update-cache
variables:
BUNDLE_WITHOUT: "" # This is to override the variable defined in .gitlab-ci.yml
BUNDLE_WITHOUT: "" # This is to override the variable defined in .gitlab-ci.yml
BUNDLE_ONLY: "coverage"
script:
- source scripts/utils.sh
......@@ -75,7 +75,7 @@ update-ruby-gems-coverage-cache-push:
- .default-retry
- .ruby-gems-coverage-cache
variables:
BUNDLE_WITHOUT: "" # This is to override the variable defined in .gitlab-ci.yml
BUNDLE_WITHOUT: "" # This is to override the variable defined in .gitlab-ci.yml
BUNDLE_ONLY: "coverage"
before_script:
- source scripts/utils.sh
......@@ -348,8 +348,8 @@ rspec:artifact-collector unit:
- .artifact-collector
- .rails:rules:ee-and-foss-unit
needs:
- rspec unit pg14 # 24 jobs
- job: rspec unit clickhouse # 1 job
- rspec unit pg14 # 24 jobs
- job: rspec unit clickhouse # 1 job
optional: true
rspec:artifact-collector system:
......@@ -357,17 +357,17 @@ rspec:artifact-collector system:
- .artifact-collector
- .rails:rules:ee-and-foss-system
needs:
- rspec system pg14 # 26 jobs
- rspec system pg14 # 26 jobs
rspec:artifact-collector remainder:
extends:
- .artifact-collector
needs:
- job: rspec integration pg14 # 13 jobs
- job: rspec integration pg14 # 13 jobs
optional: true
- job: rspec migration pg14 # 12 jobs
- job: rspec migration pg14 # 12 jobs
optional: true
- job: rspec background_migration pg14 # 4 jobs
- job: rspec background_migration pg14 # 4 jobs
optional: true
rules:
- !reference ['.rails:rules:ee-and-foss-integration', rules]
......@@ -379,7 +379,7 @@ rspec:artifact-collector as-if-foss unit:
- .artifact-collector
- .rails:rules:as-if-foss-unit
needs:
- rspec unit pg14-as-if-foss # 28 jobs
- rspec unit pg14-as-if-foss # 28 jobs
rspec:artifact-collector as-if-foss system:
extends:
......@@ -392,11 +392,11 @@ rspec:artifact-collector as-if-foss remainder:
extends:
- .artifact-collector
needs:
- job: rspec integration pg14-as-if-foss # 12 jobs
- job: rspec integration pg14-as-if-foss # 12 jobs
optional: true
- job: rspec migration pg14-as-if-foss # 8 jobs
- job: rspec migration pg14-as-if-foss # 8 jobs
optional: true
- job: rspec background_migration pg14-as-if-foss # 4 jobs
- job: rspec background_migration pg14-as-if-foss # 4 jobs
optional: true
rules:
- !reference ['.rails:rules:as-if-foss-integration', rules]
......@@ -408,43 +408,43 @@ rspec:artifact-collector single-redis:
- .artifact-collector
- .rails:rules:single-redis
needs:
- rspec unit pg14 single-redis # 28 jobs
- rspec integration pg14 single-redis # 12 jobs
- rspec unit pg14 single-redis # 28 jobs
- rspec integration pg14 single-redis # 12 jobs
rspec:artifact-collector system single-redis:
extends:
- .artifact-collector
- .rails:rules:single-redis
needs:
- rspec system pg14 single-redis # 28 jobs
- rspec system pg14 single-redis # 28 jobs
rspec:artifact-collector ee single-redis:
extends:
- .artifact-collector
- .rails:rules:single-redis
needs:
- job: rspec-ee unit pg14 single-redis # 18 jobs
- job: rspec-ee unit pg14 single-redis # 18 jobs
optional: true
- job: rspec-ee integration pg14 single-redis # 6 jobs
- job: rspec-ee integration pg14 single-redis # 6 jobs
optional: true
- job: rspec-ee system pg14 single-redis # 10 jobs
- job: rspec-ee system pg14 single-redis # 10 jobs
optional: true
rspec:artifact-collector ee:
extends:
- .artifact-collector
needs:
- job: rspec-ee migration pg14 # 2 jobs
- job: rspec-ee migration pg14 # 2 jobs
optional: true
- job: rspec-ee background_migration pg14 # 2 jobs
- job: rspec-ee background_migration pg14 # 2 jobs
optional: true
- job: rspec-ee unit pg14 # 22 jobs
- job: rspec-ee unit pg14 # 22 jobs
optional: true
- job: rspec-ee unit clickhouse # 1 job
- job: rspec-ee unit clickhouse # 1 job
optional: true
- job: rspec-ee integration pg14 # 5 jobs
- job: rspec-ee integration pg14 # 5 jobs
optional: true
- job: rspec-ee system pg14 # 12 jobs
- job: rspec-ee system pg14 # 12 jobs
optional: true
rules:
- !reference ['.rails:rules:ee-only-migration', rules]
......
.gitlab/ci/review-apps/main.gitlab-ci.yml
+ 4
− 4
View file @ 0b85630e
......@@ -45,10 +45,10 @@ review-build-cng-env:
scripts/trigger-build.rb
VERSION
before_script:
- apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually
- apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually
- !reference [".fast-no-clone-job", before_script]
- !reference [".build-cng-env", before_script]
- mv VERSION GITLAB_WORKHORSE_VERSION # GITLAB_WORKHORSE_VERSION is a symlink to VERSION
- mv VERSION GITLAB_WORKHORSE_VERSION # GITLAB_WORKHORSE_VERSION is a symlink to VERSION
review-build-cng:
extends:
......@@ -98,9 +98,9 @@ review-deploy:
scripts/review_apps/seed-dast-test-data.sh
VERSION
before_script:
- apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually
- apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually
- !reference [".fast-no-clone-job", before_script]
- mv VERSION GITLAB_WORKHORSE_VERSION # GITLAB_WORKHORSE_VERSION is a symlink to VERSION
- mv VERSION GITLAB_WORKHORSE_VERSION # GITLAB_WORKHORSE_VERSION is a symlink to VERSION
- export GITLAB_SHELL_VERSION=$(<GITLAB_SHELL_VERSION)
- export GITALY_VERSION=$(<GITALY_SERVER_VERSION)
- export GITLAB_WORKHORSE_VERSION=$(<GITLAB_WORKHORSE_VERSION)
......
.gitlab/ci/rules.gitlab-ci.yml
+ 6
− 6
View file @ 0b85630e
......@@ -931,7 +931,7 @@
variables:
BUILD_GDK_BASE: "true"
- !reference [".qa:rules:package-and-test-never-run", rules]
- <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule
- <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule
when: never
- <<: *if-default-branch-refs
- <<: *if-merge-request
......@@ -1589,9 +1589,9 @@
- <<: *if-merge-request-approved-and-specific-devops-stage
changes: *code-patterns
allow_failure: true
# We used to have a rule at the end here that would catch any remaining code MRs and allow the job to be run
# manually. That rule is now in ".qa:rules:code-merge-request-manual" so it can be included when needed and we can
# still use ".qa:rules:package-and-test-common" in jobs we don't want to be manual.
# We used to have a rule at the end here that would catch any remaining code MRs and allow the job to be run
# manually. That rule is now in ".qa:rules:code-merge-request-manual" so it can be included when needed and we can
# still use ".qa:rules:package-and-test-common" in jobs we don't want to be manual.
# Like .qa:rules:package-and-test-common but not allowed to fail.
# It's named `e2e` instead of `package-and-test` because it's used for e2e tests on GDK (and could be used
......@@ -1628,7 +1628,7 @@
variables:
MR_CODE_PATTERNS: "true"
- <<: *if-merge-request
changes: *code-qa-patterns # Includes all CI changes
changes: *code-qa-patterns # Includes all CI changes
- <<: *if-force-ci
when: manual
......@@ -1684,7 +1684,7 @@
rules:
- if: '$QA_RUN_TESTS_ON_GDK !~ /true|yes|1/i'
when: never
- <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule
- <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule
when: never
- !reference [".qa:rules:e2e-blocking", rules]
- !reference [".qa:rules:e2e-schedule-blocking", rules]
......
.gitlab/ci/templates/gem.gitlab-ci.yml
+ 1
− 1
View file @ 0b85630e
......@@ -21,7 +21,7 @@ spec:
# Ensure dependency updates don't fail child pipelines: https://gitlab.com/gitlab-org/gitlab/-/issues/417428
- "Gemfile.lock"
- "gems/gem.gitlab-ci.yml"
# Ensure new cop in the monolith don't break internal gems Rubocop checks: https://gitlab.com/gitlab-org/gitlab/-/issues/419915
# Ensure new cop in the monolith don't break internal gems Rubocop checks: https://gitlab.com/gitlab-org/gitlab/-/issues/419915
- ".rubocop.yml"
- "rubocop/**/*"
- ".rubocop_todo/**/*"
......
.gitlab/ci/test-on-gdk/main.gitlab-ci.yml
+ 1
− 1
View file @ 0b85630e
......@@ -27,7 +27,7 @@ include:
variables:
COLORIZED_LOGS: "true"
GIT_DEPTH: "20"
GIT_STRATEGY: "clone" # 'GIT_STRATEGY: clone' optimizes the pack-objects cache hit ratio
GIT_STRATEGY: "clone" # 'GIT_STRATEGY: clone' optimizes the pack-objects cache hit ratio
GIT_SUBMODULE_STRATEGY: "none"
.rules:gdk:qa-selective:
......
lib/gitlab/ci/templates/Cosign.gitlab-ci.yml
+ 2
− 2
View file @ 0b85630e
......@@ -12,9 +12,9 @@ include:
docker-build:
variables:
COSIGN_YES: "true" # Used by Cosign to skip confirmation prompts for non-destructive operations
COSIGN_YES: "true" # Used by Cosign to skip confirmation prompts for non-destructive operations
id_tokens:
SIGSTORE_ID_TOKEN: # Used by Cosign to get certificate from Fulcio
SIGSTORE_ID_TOKEN: # Used by Cosign to get certificate from Fulcio
aud: sigstore
after_script:
- apk add --update cosign
......
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