diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-19 13:50:15 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-08-21 07:54:45 +0000 |
| commit | c999f046b919f54e38b6a4ee364ea6d27531c682 (patch) | |
| tree | 93793a6baffcb90298bac2c126eb26873a9a71b0 /.gitlab | |
| parent | 9d301fac4a129875f2eb31b04cedfa37f9dd932e (diff) | |
| download | gitlab-ce-c999f046b919f54e38b6a4ee364ea6d27531c682.tar.gz | |
Merge branch 'qa-backport-fix-remaining-prepend-lines' into 'master'
Update qa/Dockerfile to be built from the project root context
See merge request gitlab-org/gitlab-ce!31533
(cherry picked from commit 4d4e88df01554336daf245a68653b80ca00989a5)
6aa215aa Support X_if_ee methods for QA tests
b601cfcf Update qa/Dockerfile to be built from the project root context
9a4dcd8d Update the 'build-qa-image' job to be built from project root context
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 4a9269ffd82..3cbfa32d9a5 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -50,7 +50,7 @@ build-qa-image: <<: *review-docker stage: test script: - - time docker build --cache-from ${LATEST_QA_IMAGE} --tag ${QA_IMAGE} ./qa/ + - time docker build --cache-from ${LATEST_QA_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} |