diff options
Diffstat (limited to '.gitlab/ci/review-apps/main.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/review-apps/main.gitlab-ci.yml | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index c5f56076ce7..a3ced427ea1 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -30,17 +30,37 @@ dont-interrupt-me: review-build-cng-env: extends: + - .review-build-cng-env - .default-retry - .review:rules:review-build-cng + - .fast-no-clone-job + variables: + # We use > instead of | because we want the files to be space-separated. + FILES_TO_DOWNLOAD: > + GITALY_SERVER_VERSION + GITLAB_ELASTICSEARCH_INDEXER_VERSION + GITLAB_KAS_VERSION + GITLAB_METRICS_EXPORTER_VERSION + GITLAB_PAGES_VERSION + GITLAB_SHELL_VERSION + scripts/trigger-build.rb + VERSION + before_script: + - apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually + - !reference [".fast-no-clone-job", before_script] + - !reference [".review-build-cng-env", before_script] + - mv VERSION GITLAB_WORKHORSE_VERSION # GITLAB_WORKHORSE_VERSION is a symlink to VERSION review-build-cng: - extends: .review:rules:review-build-cng + extends: + - .review-build-cng + - .review:rules:review-build-cng needs: ["review-build-cng-env"] .review-workflow-base: image: ${REVIEW_APPS_IMAGE} retry: - max: 2 # This is confusing but this means "3 runs at max" + max: 1 # This is confusing but this means "2 runs at max" variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" @@ -49,6 +69,7 @@ review-build-cng: GITLAB_REPO_URL: ${CI_PROJECT_URL} GITLAB_IMAGE_REPOSITORY: "registry.gitlab.com/gitlab-org/build/cng-mirror" GITLAB_IMAGE_SUFFIX: "ee" + GITLAB_REVIEW_APP_BASE_CONFIG_FILE: "scripts/review_apps/base-config.yaml" GITLAB_HELM_CHART_REF: "75b1486a9aec212d0f49ef1251526d8e51004bbc" # 7.0.1: https://gitlab.com/gitlab-org/charts/gitlab/-/commit/75b1486a9aec212d0f49ef1251526d8e51004bbc environment: name: review/${CI_COMMIT_REF_SLUG}${SCHEDULE_TYPE} # No separator for SCHEDULE_TYPE so it's compatible as before and looks nice without it @@ -59,6 +80,7 @@ review-deploy: extends: - .review-workflow-base - .review:rules:review-deploy + - .fast-no-clone-job stage: deploy image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}dtzar/helm-kubectl:3.9.3 needs: @@ -70,7 +92,18 @@ review-deploy: - "gitlab-${GITLAB_HELM_CHART_REF}" environment: action: start + variables: + # We use > instead of | because we want the files to be space-separated. + FILES_TO_DOWNLOAD: > + GITALY_SERVER_VERSION + GITLAB_SHELL_VERSION + scripts/review_apps/review-apps.sh + 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 + - !reference [".fast-no-clone-job", before_script] + - 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) |