Commit d548766c authored by Lin Jen-Shin's avatar Lin Jen-Shin

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
parents f15e3efb fb51de2e
.package-and-qa-base: .package-and-qa-base:
image: ruby:2.6-alpine image: ruby:2.6-alpine
stage: qa stage: qa
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
dependencies: [] dependencies: []
variables: variables:
GIT_DEPTH: "1" GIT_DEPTH: "1"
...@@ -20,14 +19,24 @@ package-and-qa-manual: ...@@ -20,14 +19,24 @@ package-and-qa-manual:
extends: extends:
- .package-and-qa-base - .package-and-qa-base
- .except-docs-qa - .except-docs-qa
when: manual
except: except:
- master refs:
- /(^docs[\/-].+|.+-docs$)/ - master
- /(^qa[\/-].*|.*-qa$) 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: package-and-qa:
extends: .package-and-qa-base extends: .package-and-qa-base
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
allow_failure: true allow_failure: true
only: only:
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
- source scripts/utils.sh - source scripts/utils.sh
.review-docker: .review-docker:
extends: .review-base extends:
- .default-tags
- .default-retry
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine
services: services:
- docker:19.03.0-dind - docker:19.03.0-dind
...@@ -36,7 +38,13 @@ ...@@ -36,7 +38,13 @@
QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}" QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}"
build-qa-image: 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 stage: test
script: script:
- time docker build --cache-from ${LATEST_QA_IMAGE} --tag ${QA_IMAGE} --file ./qa/Dockerfile ./ - time docker build --cache-from ${LATEST_QA_IMAGE} --tag ${QA_IMAGE} --file ./qa/Dockerfile ./
...@@ -124,7 +132,9 @@ review-stop: ...@@ -124,7 +132,9 @@ review-stop:
artifacts: {} artifacts: {}
.review-qa-base: .review-qa-base:
extends: .review-docker extends:
- .review-docker
- .review-only
retry: 2 retry: 2
stage: qa stage: qa
variables: variables:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment