diff options
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index ac2a70dda0b..6da28852291 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -21,10 +21,6 @@ package-and-qa-manual: - .package-and-qa-base - .except-docs-qa when: manual - except: - - master - - /(^docs[\/-].+|.+-docs$)/ - - /(^qa[\/-].*|.*-qa$) package-and-qa: extends: .package-and-qa-base 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: |