diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-04 18:10:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-04 18:10:24 +0300 |
| commit | 07516504537bef518a3f80b60ebca761209feab5 (patch) | |
| tree | 57130bbff016e2b2443c1a01273662469763c411 /.gitlab-ci.yml | |
| parent | 46b08e61d27f9b3f45b130f9204084ffcf50c304 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1340bd975e3..6853b100ed7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,10 +41,9 @@ workflow: QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" # Also run (detached) merge request pipelines. - if: '$CI_MERGE_REQUEST_IID' - # For the 2-hourly scheduled pipelines, we set specific variables. - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $FREQUENCY == "2-hourly"' + # For the maintenance scheduled pipelines, we set specific variables. + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "maintenance"' variables: - RUBY_VERSION: "2.7" CRYSTALBALL: "true" # For `$CI_DEFAULT_BRANCH` branch, create a pipeline (this includes on schedules, pushes, merges, etc.). - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' |