diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 12:07:56 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 12:07:56 +0000 |
commit | 045c0f9554a99c80d0a127540da168e272a9f977 (patch) | |
tree | 2c4b0d10c9432e68b6c1aca2097e663ba18b48ec /.gitlab | |
parent | 669c24d9276db9a73bbcea40aeab98273aae9e5e (diff) | |
download | gitlab-ce-045c0f9554a99c80d0a127540da168e272a9f977.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/notifications.gitlab-ci.yml | 18 | ||||
-rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 20 | ||||
-rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 22 |
3 files changed, 32 insertions, 28 deletions
diff --git a/.gitlab/ci/notifications.gitlab-ci.yml b/.gitlab/ci/notifications.gitlab-ci.yml index 0cf38d2258a..1ec61acdfca 100644 --- a/.gitlab/ci/notifications.gitlab-ci.yml +++ b/.gitlab/ci/notifications.gitlab-ci.yml @@ -1,3 +1,7 @@ +# Make sure to update all the similar conditions in other CI config files if you modify these conditions +.if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"' + .notify: image: ruby:2.6-alpine stage: notification @@ -11,13 +15,13 @@ variables: COMMIT_NOTES_URL: "https://${CI_SERVER_HOST}/${CI_PROJECT_PATH}/commit/${CI_COMMIT_SHA}#notes-list" -schedule:package-and-qa:notify-failure: - extends: - - .only:variables_refs-canonical-dot-com-schedules - - .notify +package-and-qa:notify-failure: + extends: .notify + rules: + - <<: *if-canonical-gitlab-schedule + when: manual # TODO: remove notify job if not necessary script: - 'export NOTIFICATION_MESSAGE=":skull_and_crossbones: Scheduled QA against master failed! :skull_and_crossbones: See ${CI_PIPELINE_URL}. For downstream pipelines, see ${COMMIT_NOTES_URL}"' - - 'notify_on_job_failure schedule:package-and-qa qa-master "${NOTIFICATION_MESSAGE}" ci_failing' - needs: ["schedule:package-and-qa"] + - 'notify_on_job_failure package-and-qa qa-master "${NOTIFICATION_MESSAGE}" ci_failing' + needs: ["package-and-qa"] allow_failure: true - when: manual # TODO: remove notify job if not necessary diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index e9a3cd0da90..0c7d2318009 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,5 +1,9 @@ # Make sure to update all the similar conditions in other CI config files if you modify these conditions -.if-canonical-gitlab-and-merge-request: &if-canonical-gitlab-and-merge-request +.if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"' + +# Make sure to update all the similar conditions in other CI config files if you modify these conditions +.if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' # Make sure to update all the similar patterns in other CI config files if you modify these patterns @@ -68,19 +72,13 @@ qa:selectors-foss: package-and-qa: extends: .package-and-qa-base rules: - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *qa-patterns when: on_success - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *code-patterns when: manual - needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] - allow_failure: true - -schedule:package-and-qa: - extends: - - .package-and-qa-base - - .default-only - - .only:variables_refs-canonical-dot-com-schedules + - <<: *if-canonical-gitlab-schedule + when: on_success needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 43686a5c8e7..a42a927c6b9 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -1,9 +1,9 @@ # Make sure to update all the similar conditions in other CI config files if you modify these conditions -.if-canonical-gitlab: &if-canonical-gitlab - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/' +.if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"' # Make sure to update all the similar conditions in other CI config files if you modify these conditions -.if-canonical-gitlab-and-merge-request: &if-canonical-gitlab-and-merge-request +.if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' # Make sure to update all the similar patterns in other CI config files if you modify these patterns @@ -44,9 +44,11 @@ build-qa-image: extends: .review-docker stage: prepare rules: - - <<: *if-canonical-gitlab + - <<: *if-canonical-gitlab-merge-request changes: *code-qa-patterns when: on_success + - <<: *if-canonical-gitlab-schedule + when: on_success script: - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"' - export QA_MASTER_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/gitlab-${GITLAB_EDITION}-qa:master" @@ -157,7 +159,7 @@ schedule:review-build-cng: review-deploy: extends: .review-deploy-base rules: - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *code-qa-patterns when: on_success @@ -184,7 +186,7 @@ review-stop-failed-deployment: extends: .base-review-stop stage: prepare rules: - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *code-qa-patterns when: on_success script: @@ -194,7 +196,7 @@ review-stop: extends: .base-review-stop stage: review rules: - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *code-qa-patterns when: manual allow_failure: true @@ -235,7 +237,7 @@ review-stop: review-qa-smoke: extends: .review-qa-base rules: - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *code-qa-patterns when: on_success script: @@ -244,7 +246,7 @@ review-qa-smoke: review-qa-all: extends: .review-qa-base rules: - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *code-qa-patterns when: manual parallel: 5 @@ -276,7 +278,7 @@ review-qa-all: review-performance: extends: .review-performance-base rules: - - <<: *if-canonical-gitlab-and-merge-request + - <<: *if-canonical-gitlab-merge-request changes: *code-qa-patterns when: on_success needs: ["review-deploy"] |