diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 18:00:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 18:00:40 +0300 |
| commit | 39af8005d54fa4d6b0b29f7c425b68031a9f3e18 (patch) | |
| tree | 7b92dd028c0c15580901b8b473bcc9cb6e6f35de /.gitlab | |
| parent | 34a74e4d2d9fc8e6c974560447739656613af126 (diff) | |
Add latest changes from gitlab-org/gitlab@12-6-stable-ee
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 49447bc629b..1062f6b03a4 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -25,9 +25,9 @@ build-qa-image: - '[[ ! -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 ./ - - echo "${CI_JOB_TOKEN}" | docker login --username gitlab-ci-token --password-stdin ${CI_REGISTRY} - time docker push ${QA_IMAGE} .base-review-cleanup: |