diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-27 21:10:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-27 21:10:54 +0300 |
| commit | c241fef1814b6f2fc5931f3d1e26de0378c02ccf (patch) | |
| tree | bdfc56d0606281fba8b21911c31f26da0df08838 /.gitlab/ci | |
| parent | 99befc3927c859a3ecc9ef5d895d3f820ac5317d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 82611ee713f..fb6d5533309 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -370,19 +370,11 @@ when: never - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *ci-build-images-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *code-qa-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" - <<: *if-dot-com-gitlab-org-default-branch changes: *code-qa-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA}" - <<: *if-dot-com-gitlab-org-schedule - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA}" .build-images:rules:build-assets-image: rules: @@ -594,24 +586,16 @@ when: never - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *ci-qa-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" allow_failure: true - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *qa-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" allow_failure: true - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *code-patterns when: manual - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" allow_failure: true - <<: *if-dot-com-gitlab-org-schedule allow_failure: true - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA}" ############### # Rails rules # @@ -1298,17 +1282,11 @@ when: never - <<: *if-dot-com-gitlab-org-merge-request changes: *ci-review-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" - <<: *if-dot-com-gitlab-org-merge-request changes: *frontend-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" allow_failure: true - <<: *if-dot-com-gitlab-org-merge-request changes: *code-qa-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" allow_failure: true # The rule needs to be duplicated between `on_success` and `on_failure` @@ -1344,13 +1322,9 @@ - <<: *if-dot-com-gitlab-org-merge-request changes: *code-patterns when: manual - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" allow_failure: true - <<: *if-dot-com-gitlab-org-merge-request changes: *qa-patterns - variables: - QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" allow_failure: true # The rule needs to be duplicated between `on_success` and `on_failure` |