diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-09-03 11:18:33 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-09-03 11:18:33 +0000 |
| commit | d548766cd46220c9fb7c76539a1b1e9463cb5dfe (patch) | |
| tree | de2a1e666808b4574257e14ad8474ea16139b164 | |
| parent | f15e3efba0e0523575ce61bd80396abda94b8cec (diff) | |
| parent | fb51de2e496bb37974eaec0a47720fddb149c488 (diff) | |
| download | gitlab-ce-d548766cd46220c9fb7c76539a1b1e9463cb5dfe.tar.gz | |
Merge branch 'create-build-qa-image-for-all-pipelines' into 'master'
Make sure 'build-qa-image' is created for all pipelines
See merge request gitlab-org/gitlab-ce!32570
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 19 | ||||
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 16 |
2 files changed, 27 insertions, 8 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index ac2a70dda0b..caa7d18c1ee 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,7 +1,6 @@ .package-and-qa-base: image: ruby:2.6-alpine stage: qa - needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] dependencies: [] variables: GIT_DEPTH: "1" @@ -20,14 +19,24 @@ package-and-qa-manual: extends: - .package-and-qa-base - .except-docs-qa - when: manual except: - - master - - /(^docs[\/-].+|.+-docs$)/ - - /(^qa[\/-].*|.*-qa$) + refs: + - master + needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] + when: manual + +package-and-qa-manual:master: + extends: + - .package-and-qa-base + needs: ["build-qa-image", "gitlab:assets:compile"] + only: + refs: + - master + when: manual package-and-qa: extends: .package-and-qa-base + needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true only: - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 3415f1b6ab4..360e4433e57 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -22,7 +22,9 @@ - source scripts/utils.sh .review-docker: - extends: .review-base + extends: + - .default-tags + - .default-retry image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine services: - docker:19.03.0-dind @@ -36,7 +38,13 @@ QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}" build-qa-image: - extends: .review-docker + extends: + - .review-docker + - .except-docs-qa + only: + refs: + - branches@gitlab-org/gitlab-ce + - branches@gitlab-org/gitlab-ee stage: test script: - time docker build --cache-from ${LATEST_QA_IMAGE} --tag ${QA_IMAGE} --file ./qa/Dockerfile ./ @@ -124,7 +132,9 @@ review-stop: artifacts: {} .review-qa-base: - extends: .review-docker + extends: + - .review-docker + - .review-only retry: 2 stage: qa variables: |