diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 09:10:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 09:10:09 +0000 |
| commit | 9bd7e5997e1452257e3861555c151764cf0574d7 (patch) | |
| tree | a5c429831f37884520e0dfbacfc89bb616dc5577 /.gitlab/ci | |
| parent | 4b41b57abf3ad9c2e0e81b3804cb01af6f879349 (diff) | |
| download | gitlab-ce-9bd7e5997e1452257e3861555c151764cf0574d7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab/ci/review-apps/qa.gitlab-ci.yml | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index ff941c47563..9c92b11d4fd 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -179,11 +179,19 @@ - *ruby-gems-cache - *node-modules-cache +.qa-bundler-variables: &qa-bundler-variables + variables: + BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true" + BUNDLE_SILENCE_ROOT_WARNING: "true" + BUNDLE_PATH: vendor + .qa-cache: + <<: *qa-bundler-variables cache: - *qa-ruby-gems-cache .qa-cache-push: + <<: *qa-bundler-variables cache: - *qa-ruby-gems-cache-push diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 8df829a2c84..12275260c0c 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -11,8 +11,7 @@ QA_EXPORT_TEST_METRICS: "false" before_script: - !reference [.default-before_script, before_script] - - cd qa/ - - bundle install + - cd qa && bundle install qa:internal: extends: diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml index 4e546734108..1531c1cf2fe 100644 --- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml @@ -5,12 +5,6 @@ include: - /ci/allure-report.yml - /ci/knapsack-report.yml -.bundler_variables: - variables: - BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true" - BUNDLE_SILENCE_ROOT_WARNING: "true" - BUNDLE_PATH: vendor - .test_variables: variables: QA_GENERATE_ALLURE_REPORT: "true" @@ -27,7 +21,6 @@ include: - .use-docker-in-docker - .qa-cache - .test_variables - - .bundler_variables image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-ruby-2.7:bundler-2.3-git-2.33-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 stage: qa needs: @@ -85,7 +78,6 @@ download-knapsack-report: image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-ruby-2.7:bundler-2.3-git-2.33-chrome-${CHROME_VERSION} extends: - .qa-cache - - .bundler_variables - .review:rules:review-qa-reliable stage: prepare variables: |