Commit 2f450a1e authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-revert-gitlab-ci-reformat' into 'master'

Revert unnecessary changes to CI configuration

See merge request gitlab-org/gitlab-ee!8822
parents fd39a499 df4683f5
image: 'dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29' image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"
.dedicated-runner: &dedicated-runner .dedicated-runner: &dedicated-runner
retry: 1 retry: 1
...@@ -6,7 +6,7 @@ image: 'dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git ...@@ -6,7 +6,7 @@ image: 'dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git
- gitlab-org - gitlab-org
.default-cache: &default-cache .default-cache: &default-cache
key: 'debian-stretch-ruby-2.5.3-node-10.x' key: "debian-stretch-ruby-2.5.3-node-10.x"
paths: paths:
- vendor/ruby - vendor/ruby
- .yarn-cache/ - .yarn-cache/
...@@ -23,20 +23,20 @@ image: 'dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git ...@@ -23,20 +23,20 @@ image: 'dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git
policy: pull policy: pull
variables: variables:
MYSQL_ALLOW_EMPTY_PASSWORD: '1' MYSQL_ALLOW_EMPTY_PASSWORD: "1"
RAILS_ENV: 'test' RAILS_ENV: "test"
NODE_ENV: 'test' NODE_ENV: "test"
SIMPLECOV: 'true' SIMPLECOV: "true"
GIT_DEPTH: '20' GIT_DEPTH: "20"
GIT_SUBMODULE_STRATEGY: 'none' GIT_SUBMODULE_STRATEGY: "none"
GET_SOURCES_ATTEMPTS: '3' GET_SOURCES_ATTEMPTS: "3"
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
BUILD_ASSETS_IMAGE: 'false' BUILD_ASSETS_IMAGE: "false"
## EE specific variables ## ## EE specific variables ##
# This hack is needed to make ES not that memory hungry # This hack is needed to make ES not that memory hungry
ES_JAVA_OPTS: '-Xms256m -Xmx256m' ES_JAVA_OPTS: "-Xms256m -Xmx256m"
ELASTIC_URL: 'http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200' ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
before_script: before_script:
...@@ -63,7 +63,7 @@ stages: ...@@ -63,7 +63,7 @@ stages:
.tests-metadata-state: &tests-metadata-state .tests-metadata-state: &tests-metadata-state
<<: *dedicated-runner <<: *dedicated-runner
variables: variables:
TESTS_METADATA_S3_BUCKET: 'gitlab-ce-cache' TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache"
before_script: before_script:
- source scripts/utils.sh - source scripts/utils.sh
artifacts: artifacts:
...@@ -117,8 +117,8 @@ stages: ...@@ -117,8 +117,8 @@ stages:
- $CI_COMMIT_REF_NAME =~ /norails4/ - $CI_COMMIT_REF_NAME =~ /norails4/
- $RAILS5_DISABLED - $RAILS5_DISABLED
variables: variables:
BUNDLE_GEMFILE: 'Gemfile.rails4' BUNDLE_GEMFILE: "Gemfile.rails4"
RAILS5: 'false' RAILS5: "false"
# Skip all jobs except the ones that begin with 'docs/'. # Skip all jobs except the ones that begin with 'docs/'.
# Used for commits including ONLY documentation changes. # Used for commits including ONLY documentation changes.
...@@ -149,7 +149,7 @@ stages: ...@@ -149,7 +149,7 @@ stages:
.dedicated-no-docs-no-db-pull-cache-job: &dedicated-no-docs-no-db-pull-cache-job .dedicated-no-docs-no-db-pull-cache-job: &dedicated-no-docs-no-db-pull-cache-job
<<: *dedicated-no-docs-pull-cache-job <<: *dedicated-no-docs-pull-cache-job
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
.dedicated-no-docs-and-no-qa-pull-cache-job: &dedicated-no-docs-and-no-qa-pull-cache-job .dedicated-no-docs-and-no-qa-pull-cache-job: &dedicated-no-docs-and-no-qa-pull-cache-job
<<: *dedicated-no-docs-pull-cache-job <<: *dedicated-no-docs-pull-cache-job
...@@ -292,12 +292,12 @@ stages: ...@@ -292,12 +292,12 @@ stages:
<<: *dedicated-no-docs-and-no-qa-pull-cache-job <<: *dedicated-no-docs-and-no-qa-pull-cache-job
<<: *use-pg <<: *use-pg
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
script: script:
# Manually clone gitlab-test and only seed this project in # Manually clone gitlab-test and only seed this project in
# db/fixtures/development/04_project.rb thanks to SIZE=1 below # db/fixtures/development/04_project.rb thanks to SIZE=1 below
- git clone https://gitlab.com/gitlab-org/gitlab-test.git - git clone https://gitlab.com/gitlab-org/gitlab-test.git
/home/git/repositories/gitlab-org/gitlab-test.git /home/git/repositories/gitlab-org/gitlab-test.git
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
- force=yes SIZE=1 FIXTURE_PATH="db/fixtures/development" bundle exec rake gitlab:setup - force=yes SIZE=1 FIXTURE_PATH="db/fixtures/development" bundle exec rake gitlab:setup
artifacts: artifacts:
...@@ -315,7 +315,7 @@ stages: ...@@ -315,7 +315,7 @@ stages:
.migration-paths: &migration-paths .migration-paths: &migration-paths
<<: *dedicated-no-docs-and-no-qa-pull-cache-job <<: *dedicated-no-docs-and-no-qa-pull-cache-job
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
script: script:
- git fetch https://gitlab.com/gitlab-org/gitlab-ee.git v9.3.0-ee - git fetch https://gitlab.com/gitlab-org/gitlab-ee.git v9.3.0-ee
- git checkout -f FETCH_HEAD - git checkout -f FETCH_HEAD
...@@ -336,7 +336,7 @@ stages: ...@@ -336,7 +336,7 @@ stages:
.migration-paths-upgrade-ce-to-ee: &migration-paths-upgrade-ce-to-ee .migration-paths-upgrade-ce-to-ee: &migration-paths-upgrade-ce-to-ee
<<: *dedicated-no-docs-and-no-qa-pull-cache-job <<: *dedicated-no-docs-and-no-qa-pull-cache-job
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
script: script:
- ruby -r./scripts/ee_specific_check/ee_specific_check -e'EESpecificCheck.fetch_remote_ce_branch' - ruby -r./scripts/ee_specific_check/ee_specific_check -e'EESpecificCheck.fetch_remote_ce_branch'
- git checkout -f FETCH_HEAD - git checkout -f FETCH_HEAD
...@@ -434,7 +434,7 @@ cloud-native-image: ...@@ -434,7 +434,7 @@ cloud-native-image:
stage: post-test stage: post-test
allow_failure: true allow_failure: true
variables: variables:
GIT_DEPTH: '1' GIT_DEPTH: "1"
cache: {} cache: {}
script: script:
- gem install gitlab --no-document - gem install gitlab --no-document
...@@ -515,8 +515,8 @@ flaky-examples-check: ...@@ -515,8 +515,8 @@ flaky-examples-check:
services: [] services: []
before_script: [] before_script: []
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
USE_BUNDLE_INSTALL: 'false' USE_BUNDLE_INSTALL: "false"
NEW_FLAKY_SPECS_REPORT: rspec_flaky/report-new.json NEW_FLAKY_SPECS_REPORT: rspec_flaky/report-new.json
stage: post-test stage: post-test
allow_failure: true allow_failure: true
...@@ -607,11 +607,11 @@ setup-test-env: ...@@ -607,11 +607,11 @@ setup-test-env:
- gitlab-org - gitlab-org
- docker - docker
variables: &review-docker-variables variables: &review-docker-variables
GIT_DEPTH: '1' GIT_DEPTH: "1"
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
LATEST_QA_IMAGE: 'gitlab/${CI_PROJECT_NAME}-qa:nightly' LATEST_QA_IMAGE: "gitlab/${CI_PROJECT_NAME}-qa:nightly"
QA_IMAGE: '${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}' QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}"
build-qa-image: build-qa-image:
<<: *review-docker <<: *review-docker
...@@ -690,7 +690,7 @@ static-analysis: ...@@ -690,7 +690,7 @@ static-analysis:
script: script:
- scripts/static-analysis - scripts/static-analysis
cache: cache:
key: 'debian-stretch-ruby-2.5.3-node-10.x-and-rubocop' key: "debian-stretch-ruby-2.5.3-node-10.x-and-rubocop"
paths: paths:
- vendor/ruby - vendor/ruby
- .yarn-cache/ - .yarn-cache/
...@@ -702,10 +702,10 @@ static-analysis: ...@@ -702,10 +702,10 @@ static-analysis:
docs lint: docs lint:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-qa <<: *except-qa
image: 'registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-docs-lint' image: "registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-docs-lint"
stage: test stage: test
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
cache: {} cache: {}
dependencies: [] dependencies: []
before_script: [] before_script: []
...@@ -746,7 +746,7 @@ ee_compat_check: ...@@ -746,7 +746,7 @@ ee_compat_check:
- branches@gitlab/gitlab-ee - branches@gitlab/gitlab-ee
retry: 0 retry: 0
artifacts: artifacts:
name: '${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}' name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
when: always when: always
expire_in: 10d expire_in: 10d
paths: paths:
...@@ -819,11 +819,11 @@ gitlab:assets:compile: ...@@ -819,11 +819,11 @@ gitlab:assets:compile:
services: services:
- docker:stable-dind - docker:stable-dind
variables: variables:
NODE_ENV: 'production' NODE_ENV: "production"
RAILS_ENV: 'production' RAILS_ENV: "production"
SETUP_DB: 'false' SETUP_DB: "false"
SKIP_STORAGE_VALIDATION: 'true' SKIP_STORAGE_VALIDATION: "true"
WEBPACK_REPORT: 'true' WEBPACK_REPORT: "true"
# we override the max_old_space_size to prevent OOM errors # we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS: --max_old_space_size=3584 NODE_OPTIONS: --max_old_space_size=3584
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
...@@ -880,8 +880,8 @@ jest: ...@@ -880,8 +880,8 @@ jest:
<<: *dedicated-no-docs-and-no-qa-pull-cache-job <<: *dedicated-no-docs-and-no-qa-pull-cache-job
<<: *use-pg <<: *use-pg
dependencies: dependencies:
- compile-assets - compile-assets
- setup-test-env - setup-test-env
script: script:
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
- date - date
...@@ -893,8 +893,8 @@ jest: ...@@ -893,8 +893,8 @@ jest:
expire_in: 31d expire_in: 31d
when: always when: always
paths: paths:
- coverage-frontend/ - coverage-frontend/
- junit_jest.xml - junit_jest.xml
reports: reports:
junit: junit_jest.xml junit: junit_jest.xml
cache: cache:
...@@ -913,7 +913,7 @@ code_quality: ...@@ -913,7 +913,7 @@ code_quality:
services: services:
- docker:stable-dind - docker:stable-dind
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
cache: {} cache: {}
dependencies: [] dependencies: []
...@@ -921,10 +921,10 @@ code_quality: ...@@ -921,10 +921,10 @@ code_quality:
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run - docker run
--env SOURCE_CODE="$PWD" --env SOURCE_CODE="$PWD"
--volume "$PWD":/code --volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock --volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
artifacts: artifacts:
reports: reports:
codequality: gl-code-quality-report.json codequality: gl-code-quality-report.json
...@@ -946,10 +946,10 @@ sast: ...@@ -946,10 +946,10 @@ sast:
script: script:
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run - docker run
--env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}" --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
--volume "$PWD:/code" --volume "$PWD:/code"
--volume /var/run/docker.sock:/var/run/docker.sock --volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
artifacts: artifacts:
reports: reports:
sast: gl-sast-report.json sast: gl-sast-report.json
...@@ -969,10 +969,10 @@ dependency_scanning: ...@@ -969,10 +969,10 @@ dependency_scanning:
script: script:
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run - docker run
--env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}" --env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
--volume "$PWD:/code" --volume "$PWD:/code"
--volume /var/run/docker.sock:/var/run/docker.sock --volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
artifacts: artifacts:
reports: reports:
dependency_scanning: gl-dependency-scanning-report.json dependency_scanning: gl-dependency-scanning-report.json
...@@ -998,7 +998,7 @@ qa:selectors: ...@@ -998,7 +998,7 @@ qa:selectors:
variables: variables:
NODE_OPTIONS: --max_old_space_size=3584 NODE_OPTIONS: --max_old_space_size=3584
cache: cache:
key: '$CI_JOB_NAME' key: "$CI_JOB_NAME"
paths: paths:
- .yarn-cache/ - .yarn-cache/
dependencies: [] dependencies: []
...@@ -1034,7 +1034,7 @@ coverage: ...@@ -1034,7 +1034,7 @@ coverage:
<<: *except-docs-and-qa <<: *except-docs-and-qa
<<: *pull-cache <<: *pull-cache
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
stage: post-test stage: post-test
script: script:
- bundle exec scripts/merge-simplecov - bundle exec scripts/merge-simplecov
...@@ -1043,8 +1043,8 @@ coverage: ...@@ -1043,8 +1043,8 @@ coverage:
name: coverage name: coverage
expire_in: 31d expire_in: 31d
paths: paths:
- coverage/index.html - coverage/index.html
- coverage/assets/ - coverage/assets/
lint:javascript:report: lint:javascript:report:
<<: *dedicated-no-docs-and-no-qa-pull-cache-job <<: *dedicated-no-docs-and-no-qa-pull-cache-job
...@@ -1103,7 +1103,7 @@ gitlab_git_test: ...@@ -1103,7 +1103,7 @@ gitlab_git_test:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs-and-qa <<: *except-docs-and-qa
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
before_script: [] before_script: []
dependencies: [] dependencies: []
cache: {} cache: {}
...@@ -1114,7 +1114,7 @@ no_ee_check: ...@@ -1114,7 +1114,7 @@ no_ee_check:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs-and-qa <<: *except-docs-and-qa
variables: variables:
SETUP_DB: 'false' SETUP_DB: "false"
before_script: [] before_script: []
dependencies: [] dependencies: []
cache: {} cache: {}
...@@ -1129,11 +1129,11 @@ review-deploy: ...@@ -1129,11 +1129,11 @@ review-deploy:
retry: 2 retry: 2
allow_failure: true allow_failure: true
variables: variables:
GIT_DEPTH: '1' GIT_DEPTH: "1"
HOST_SUFFIX: '${CI_ENVIRONMENT_SLUG}' HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: '-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}' DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF: 'master' GITLAB_HELM_CHART_REF: "master"
API_TOKEN: '${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}' API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
environment: environment:
<<: *review-environment <<: *review-environment
on_stop: review-stop on_stop: review-stop
...@@ -1161,16 +1161,16 @@ review-deploy: ...@@ -1161,16 +1161,16 @@ review-deploy:
allow_failure: true allow_failure: true
variables: variables:
<<: *review-docker-variables <<: *review-docker-variables
API_TOKEN: '${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}' API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
QA_ARTIFACTS_DIR: '${CI_PROJECT_DIR}/qa' QA_ARTIFACTS_DIR: "${CI_PROJECT_DIR}/qa"
QA_CAN_TEST_GIT_PROTOCOL_V2: 'false' QA_CAN_TEST_GIT_PROTOCOL_V2: "false"
GITLAB_USERNAME: 'root' GITLAB_USERNAME: "root"
GITLAB_PASSWORD: '${REVIEW_APPS_ROOT_PASSWORD}' GITLAB_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
GITLAB_ADMIN_USERNAME: 'root' GITLAB_ADMIN_USERNAME: "root"
GITLAB_ADMIN_PASSWORD: '${REVIEW_APPS_ROOT_PASSWORD}' GITLAB_ADMIN_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
GITHUB_ACCESS_TOKEN: '${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}' GITHUB_ACCESS_TOKEN: "${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}"
EE_LICENSE: '${REVIEW_APPS_EE_LICENSE}' EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}"
QA_DEBUG: 'true' QA_DEBUG: "true"
artifacts: artifacts:
paths: paths:
- ./qa/gitlab-qa-run-* - ./qa/gitlab-qa-run-*
...@@ -1202,7 +1202,7 @@ review-stop: ...@@ -1202,7 +1202,7 @@ review-stop:
allow_failure: true allow_failure: true
variables: variables:
<<: *single-script-job-variables <<: *single-script-job-variables
SCRIPT_NAME: 'review_apps/review-apps.sh' SCRIPT_NAME: "review_apps/review-apps.sh"
when: manual when: manual
environment: environment:
<<: *review-environment <<: *review-environment
...@@ -1217,7 +1217,7 @@ schedule:review-cleanup: ...@@ -1217,7 +1217,7 @@ schedule:review-cleanup:
stage: build stage: build
allow_failure: true allow_failure: true
variables: variables:
GIT_DEPTH: '1' GIT_DEPTH: "1"
environment: environment:
name: review/auto-cleanup name: review/auto-cleanup
only: only:
......
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