VladPolskiy/gitlab-ce
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-07-20 16:42:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@17-9-stable-ee

Browse Source
This commit is contained in:
GitLab Bot
2025-06-05 17:27:14 +00:00
parent 1ce72bfe20
commit c784406533
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab/ci/rules.gitlab-ci.yml
View File

@ -87,6 +87,9 @@
.if-merge-request-targeting-stable-branch: &if-merge-request-targeting-stable-branch
if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/'
.if-merge-request-targeting-stable-branch-is-tier-3: &if-merge-request-targeting-stable-branch-is-tier-3
if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/ && $CI_MERGE_REQUEST_LABELS =~ /pipeline::tier-3/'
.if-merge-request-labels-as-if-foss: &if-merge-request-labels-as-if-foss
if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/'
@ -1805,7 +1808,7 @@
- !reference [".qa:rules:e2e-test-never-run", rules]
- <<: *if-merge-request-labels-run-all-e2e
# this rule needs to be synced with .notify:rules:notify-test-on-omnibus-failure to produce failure notification in stable branch merge requests
- <<: *if-merge-request-targeting-stable-branch
- <<: *if-merge-request-targeting-stable-branch-is-tier-3
changes: *setup-test-env-patterns
# add option to trigger test-on-omnibus manually on qa changes ahead of tier-2
- <<: *if-merge-request