summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-22 22:42:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-22 22:42:37 +0000
commit711f0b7720142761f632a87e6f3e9eb24c3aed27 (patch)
tree21a48ea6907ebf7fef8587d7e86dc4e70e398a55
parentc757b8d6946b7223e350edc0ea24db7b1ba25087 (diff)
downloadgitlab-ce-711f0b7720142761f632a87e6f3e9eb24c3aed27.tar.gz
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
-rw-r--r--.gitlab-ci.yml11
1 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8644659198a..9fa296be455 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,20 +104,15 @@ workflow:
# If `$GITLAB_INTERNAL` isn't set, don't create a pipeline.
- if: '$GITLAB_INTERNAL == null'
when: never
- # For last 3 stable branches, create a pipeline with failure notifications.
- - if: '$CI_COMMIT_BRANCH =~ /^15-[6|7|8]-stable(-ee)?$/'
+ # For stable, auto-deploy, and security branches, create a pipeline.
+ - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable(-ee)?$/'
variables:
<<: *ruby2-variables
NOTIFY_PIPELINE_FAILURE_CHANNEL: "releases"
+ PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline'
CREATE_INCIDENT_FOR_PIPELINE_FAILURE: "true"
BROKEN_BRANCH_INCIDENTS_PROJECT: "gitlab-org/release/tasks"
BROKEN_BRANCH_INCIDENTS_PROJECT_TOKEN: "${BROKEN_STABLE_INCIDENTS_PROJECT_TOKEN}"
- PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline'
- # For stable, auto-deploy, and security branches, create a pipeline.
- - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable(-ee)?$/'
- variables:
- <<: *ruby2-variables
- PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline'
- if: '$CI_COMMIT_BRANCH =~ /^\d+-\d+-auto-deploy-\d+$/'
variables:
<<: *ruby2-variables