diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-18 13:21:21 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-18 16:13:30 +0100 |
| commit | bb6f8bd8d665e5bcd05f6b73113b9c58ad34390e (patch) | |
| tree | 5e4920d8e08f494653ce01f2d223deab5c47eda0 | |
| parent | 4e8450aff6125ba48e7460db59a6341c9d680ad7 (diff) | |
| download | gitlab-ce-55107-qa-build-the-qa-image-for-master-and-tags.tar.gz | |
Build QA image on master and tags55107-qa-build-the-qa-image-for-master-and-tags
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | .gitlab-ci.yml | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d12f4142ba..c10f8a92008 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -458,17 +458,39 @@ setup-test-env: GIT_DEPTH: "1" DOCKER_DRIVER: overlay2 DOCKER_HOST: tcp://docker:2375 - LATEST_QA_IMAGE: "gitlab/${CI_PROJECT_NAME}-qa:nightly" + NIGHTLY_QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:nightly" QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}" -build-qa-image: +build-qa-image:branch: <<: *review-docker stage: prepare script: - - time docker build --cache-from ${LATEST_QA_IMAGE} --tag ${QA_IMAGE} ./qa/ + - time docker build --cache-from ${NIGHTLY_QA_IMAGE} --tag ${QA_IMAGE} ./qa/ - echo "${CI_JOB_TOKEN}" | docker login --username gitlab-ci-token --password-stdin ${CI_REGISTRY} - time docker push ${QA_IMAGE} +build-qa-image:master: + extends: build-qa-image:branch + stage: prepare + only: + refs: + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee + before_script: + - export QA_IMAGE="${NIGHTLY_QA_IMAGE}" + +build-qa-image:tags: + extends: build-qa-image:branch + stage: prepare + before_script: + # Transform 11.6.0+rc3.ce.0 into 11.6.0-rc3 and 11.6.0+rc3.ee.0 into 11.6.0-rc3-ee + - export QA_IMAGE_TAG="echo "${CI_COMMIT_TAG}" | sed 's/+/-/' | sed -E 's/\.ce\.[0-9]+$//' | sed -E 's/\.ee\.[0-9]+$/-ee/'" + - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${QA_IMAGE_TAG}" + only: + refs: + - tags@gitlab/gitlabhq + - tags@gitlab/gitlab-ee + danger-review: <<: *pull-cache image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger |