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

Revert unnecessary changes to CI configuration

See merge request gitlab-org/gitlab-ee!8822

.gitlab-ci.yml

-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
   retry: 1
@@ -6,7 +6,7 @@ image: 'dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git
     - gitlab-org
 
 .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:
     - vendor/ruby
     - .yarn-cache/
@@ -23,20 +23,20 @@ image: 'dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git
     policy: pull
 
 variables:
-  MYSQL_ALLOW_EMPTY_PASSWORD: '1'
-  RAILS_ENV: 'test'
-  NODE_ENV: 'test'
-  SIMPLECOV: 'true'
-  GIT_DEPTH: '20'
-  GIT_SUBMODULE_STRATEGY: 'none'
-  GET_SOURCES_ATTEMPTS: '3'
+  MYSQL_ALLOW_EMPTY_PASSWORD: "1"
+  RAILS_ENV: "test"
+  NODE_ENV: "test"
+  SIMPLECOV: "true"
+  GIT_DEPTH: "20"
+  GIT_SUBMODULE_STRATEGY: "none"
+  GET_SOURCES_ATTEMPTS: "3"
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
-  BUILD_ASSETS_IMAGE: 'false'
+  BUILD_ASSETS_IMAGE: "false"
   ## EE specific variables ##
   # This hack is needed to make ES not that memory hungry
-  ES_JAVA_OPTS: '-Xms256m -Xmx256m'
-  ELASTIC_URL: 'http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200'
+  ES_JAVA_OPTS: "-Xms256m -Xmx256m"
+  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
 
 before_script:
@@ -63,7 +63,7 @@ stages:
 .tests-metadata-state: &tests-metadata-state
   <<: *dedicated-runner
   variables:
-    TESTS_METADATA_S3_BUCKET: 'gitlab-ce-cache'
+    TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache"
   before_script:
     - source scripts/utils.sh
   artifacts:
@@ -117,8 +117,8 @@ stages:
       - $CI_COMMIT_REF_NAME =~ /norails4/
       - $RAILS5_DISABLED
   variables:
-    BUNDLE_GEMFILE: 'Gemfile.rails4'
-    RAILS5: 'false'
+    BUNDLE_GEMFILE: "Gemfile.rails4"
+    RAILS5: "false"
 
 # Skip all jobs except the ones that begin with 'docs/'.
 # Used for commits including ONLY documentation changes.
@@ -149,7 +149,7 @@ stages:
 .dedicated-no-docs-no-db-pull-cache-job: &dedicated-no-docs-no-db-pull-cache-job
   <<: *dedicated-no-docs-pull-cache-job
   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-pull-cache-job
@@ -292,7 +292,7 @@ stages:
   <<: *dedicated-no-docs-and-no-qa-pull-cache-job
   <<: *use-pg
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
   script:
     # Manually clone gitlab-test and only seed this project in
     # db/fixtures/development/04_project.rb thanks to SIZE=1 below
@@ -315,7 +315,7 @@ stages:
 .migration-paths: &migration-paths
   <<: *dedicated-no-docs-and-no-qa-pull-cache-job
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
   script:
     - git fetch https://gitlab.com/gitlab-org/gitlab-ee.git v9.3.0-ee
     - git checkout -f FETCH_HEAD
@@ -336,7 +336,7 @@ stages:
 .migration-paths-upgrade-ce-to-ee: &migration-paths-upgrade-ce-to-ee
   <<: *dedicated-no-docs-and-no-qa-pull-cache-job
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
   script:
     - ruby -r./scripts/ee_specific_check/ee_specific_check -e'EESpecificCheck.fetch_remote_ce_branch'
     - git checkout -f FETCH_HEAD
@@ -434,7 +434,7 @@ cloud-native-image:
   stage: post-test
   allow_failure: true
   variables:
-    GIT_DEPTH: '1'
+    GIT_DEPTH: "1"
   cache: {}
   script:
     - gem install gitlab --no-document
@@ -515,8 +515,8 @@ flaky-examples-check:
   services: []
   before_script: []
   variables:
-    SETUP_DB: 'false'
-    USE_BUNDLE_INSTALL: 'false'
+    SETUP_DB: "false"
+    USE_BUNDLE_INSTALL: "false"
     NEW_FLAKY_SPECS_REPORT: rspec_flaky/report-new.json
   stage: post-test
   allow_failure: true
@@ -607,11 +607,11 @@ setup-test-env:
     - gitlab-org
     - docker
   variables: &review-docker-variables
-    GIT_DEPTH: '1'
+    GIT_DEPTH: "1"
     DOCKER_DRIVER: overlay2
     DOCKER_HOST: tcp://docker:2375
-    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}'
+    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}"
 
 build-qa-image:
   <<: *review-docker
@@ -690,7 +690,7 @@ static-analysis:
   script:
     - scripts/static-analysis
   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:
       - vendor/ruby
       - .yarn-cache/
@@ -702,10 +702,10 @@ static-analysis:
 docs lint:
   <<: *dedicated-runner
   <<: *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
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
   cache: {}
   dependencies: []
   before_script: []
@@ -746,7 +746,7 @@ ee_compat_check:
     - branches@gitlab/gitlab-ee
   retry: 0
   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
     expire_in: 10d
     paths:
@@ -819,11 +819,11 @@ gitlab:assets:compile:
   services:
     - docker:stable-dind
   variables:
-    NODE_ENV: 'production'
-    RAILS_ENV: 'production'
-    SETUP_DB: 'false'
-    SKIP_STORAGE_VALIDATION: 'true'
-    WEBPACK_REPORT: 'true'
+    NODE_ENV: "production"
+    RAILS_ENV: "production"
+    SETUP_DB: "false"
+    SKIP_STORAGE_VALIDATION: "true"
+    WEBPACK_REPORT: "true"
     # we override the max_old_space_size to prevent OOM errors
     NODE_OPTIONS: --max_old_space_size=3584
     DOCKER_DRIVER: overlay2
@@ -913,7 +913,7 @@ code_quality:
   services:
     - docker:stable-dind
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
     DOCKER_DRIVER: overlay2
   cache: {}
   dependencies: []
@@ -998,7 +998,7 @@ qa:selectors:
   variables:
     NODE_OPTIONS: --max_old_space_size=3584
   cache:
-    key: '$CI_JOB_NAME'
+    key: "$CI_JOB_NAME"
     paths:
       - .yarn-cache/
   dependencies: []
@@ -1034,7 +1034,7 @@ coverage:
   <<: *except-docs-and-qa
   <<: *pull-cache
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
   stage: post-test
   script:
     - bundle exec scripts/merge-simplecov
@@ -1103,7 +1103,7 @@ gitlab_git_test:
   <<: *dedicated-runner
   <<: *except-docs-and-qa
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
   before_script: []
   dependencies: []
   cache: {}
@@ -1114,7 +1114,7 @@ no_ee_check:
   <<: *dedicated-runner
   <<: *except-docs-and-qa
   variables:
-    SETUP_DB: 'false'
+    SETUP_DB: "false"
   before_script: []
   dependencies: []
   cache: {}
@@ -1129,11 +1129,11 @@ review-deploy:
   retry: 2
   allow_failure: true
   variables:
-    GIT_DEPTH: '1'
-    HOST_SUFFIX: '${CI_ENVIRONMENT_SLUG}'
-    DOMAIN: '-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}'
-    GITLAB_HELM_CHART_REF: 'master'
-    API_TOKEN: '${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}'
+    GIT_DEPTH: "1"
+    HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
+    DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
+    GITLAB_HELM_CHART_REF: "master"
+    API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
   environment:
     <<: *review-environment
     on_stop: review-stop
@@ -1161,16 +1161,16 @@ review-deploy:
   allow_failure: true
   variables:
     <<: *review-docker-variables
-    API_TOKEN: '${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}'
-    QA_ARTIFACTS_DIR: '${CI_PROJECT_DIR}/qa'
-    QA_CAN_TEST_GIT_PROTOCOL_V2: 'false'
-    GITLAB_USERNAME: 'root'
-    GITLAB_PASSWORD: '${REVIEW_APPS_ROOT_PASSWORD}'
-    GITLAB_ADMIN_USERNAME: 'root'
-    GITLAB_ADMIN_PASSWORD: '${REVIEW_APPS_ROOT_PASSWORD}'
-    GITHUB_ACCESS_TOKEN: '${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}'
-    EE_LICENSE: '${REVIEW_APPS_EE_LICENSE}'
-    QA_DEBUG: 'true'
+    API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
+    QA_ARTIFACTS_DIR: "${CI_PROJECT_DIR}/qa"
+    QA_CAN_TEST_GIT_PROTOCOL_V2: "false"
+    GITLAB_USERNAME: "root"
+    GITLAB_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
+    GITLAB_ADMIN_USERNAME: "root"
+    GITLAB_ADMIN_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
+    GITHUB_ACCESS_TOKEN: "${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}"
+    EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}"
+    QA_DEBUG: "true"
   artifacts:
     paths:
       - ./qa/gitlab-qa-run-*
@@ -1202,7 +1202,7 @@ review-stop:
   allow_failure: true
   variables:
     <<: *single-script-job-variables
-    SCRIPT_NAME: 'review_apps/review-apps.sh'
+    SCRIPT_NAME: "review_apps/review-apps.sh"
   when: manual
   environment:
     <<: *review-environment
@@ -1217,7 +1217,7 @@ schedule:review-cleanup:
   stage: build
   allow_failure: true
   variables:
-    GIT_DEPTH: '1'
+    GIT_DEPTH: "1"
   environment:
     name: review/auto-cleanup
   only: