diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
| commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
| tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /.gitlab/ci/review.gitlab-ci.yml | |
| parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) | |
| download | gitlab-ce-983a0bba5d2a042c4a3bbb22432ec192c7501d82.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to '.gitlab/ci/review.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 4a13a92598e..06710b3b9dd 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -8,17 +8,14 @@ build-qa-image: extends: - - .review-docker + - .use-kaniko + - .default-retry - .review:rules:mr-and-schedule-auto stage: prepare script: - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"' - - export QA_MASTER_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/gitlab-${GITLAB_EDITION}-qa:master" - - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}" - - echo "${CI_JOB_TOKEN}" | docker login --username gitlab-ci-token --password-stdin ${CI_REGISTRY} - - time docker pull "${QA_MASTER_IMAGE}" - - time docker build --cache-from "${QA_MASTER_IMAGE}" --tag ${QA_IMAGE} --file ./qa/Dockerfile ./ - - time docker push ${QA_IMAGE} + - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}" + - /kaniko/executor --context=${CI_PROJECT_DIR} --dockerfile=${CI_PROJECT_DIR}/qa/Dockerfile --destination=${QA_IMAGE} --cache=true .review-cleanup-base: extends: @@ -183,7 +180,7 @@ review-stop: EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}" before_script: - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"' - - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}" + - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}" - export CI_ENVIRONMENT_URL="$(cat environment_url.txt)" - echo "${CI_ENVIRONMENT_URL}" - echo "${QA_IMAGE}" |