diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 21:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 21:09:19 +0300 |
| commit | 3290d46655f07d7ae3dca788d6df9f326972ffd8 (patch) | |
| tree | 0d24713e1592cdd3583257f14a52d46a22539ed1 /.gitlab/ci/review.gitlab-ci.yml | |
| parent | c6b3ec3f56fa32a0e0ed3de0d0878d25f1adaddf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/review.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 0e93c1d3bee..8148b044eb4 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -81,7 +81,7 @@ review-build-cng: .review-workflow-base: extends: - .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-helm3-kubectl1.14 variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" @@ -113,7 +113,6 @@ review-deploy: script: - check_kube_domain - ensure_namespace - - install_tiller - install_external_dns - download_chart - date @@ -149,6 +148,7 @@ review-stop-failed-deployment: stage: prepare script: - delete_failed_release + - delete_helm2_release review-stop: extends: @@ -210,8 +210,11 @@ review-qa-all: review-performance: extends: - - .review-docker + - .default-retry - .review:rules:mr-and-schedule-auto-if-frontend-manual-otherwise + image: + name: sitespeedio/sitespeed.io:6.3.1 + entrypoint: [""] stage: qa # This is needed so that manual jobs with needs don't block the pipeline. # See https://gitlab.com/gitlab-org/gitlab/-/issues/199979. @@ -224,7 +227,7 @@ review-performance: - wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js - mkdir -p sitespeed-results script: - - docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.3.1 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "${CI_ENVIRONMENT_URL}" + - /start.sh --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "${CI_ENVIRONMENT_URL}" after_script: - mv sitespeed-results/data/performance.json performance.json artifacts: |