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

This commit is contained in:
GitLab Bot
2025-06-23 19:45:53 +00:00
parent 23dc09d89d
commit d51644f12b
2 changed files with 6 additions and 2 deletions

View File

@ -237,6 +237,10 @@
.if-observability-skip-e2e-jobs: &if-observability-skip-e2e-jobs
if: '$SKIP_GITLAB_OBSERVABILITY_BACKEND_TRIGGER || $GITLAB_OBSERVABILITY_BACKEND_PIPELINE_TRIGGER_TOKEN == null || $GITLAB_OBSERVABILITY_BACKEND_TOKEN_FOR_CI_SCRIPTS == null'
.if-dev-internal-release: &if-dev-internal-release
if: '$CI_SERVER_HOST == "dev.gitlab.org" && $CI_PROJECT_PATH == "gitlab/gitlab-ee" && $CI_COMMIT_REF_NAME =~
/^[\d-]+-stable-ee$/ && $CI_COMMIT_TITLE =~ /^Update VERSION file.*internal/'
####################
# Changes patterns #
####################
@ -1086,6 +1090,7 @@
- <<: *if-dot-com-gitlab-org-schedule
variables:
ARCH: amd64,arm64
- <<: *if-dev-internal-release
- !reference [".build-images:rules:build-qa-image-merge-requests", rules]
- !reference [".releases:rules:canonical-dot-com-gitlab-stable-branch-only-setup-test-env", rules]
# Always build on stable branches to serve release-environments pipeline

View File

@ -61,8 +61,7 @@ fi
# Then set DESTINATIONS to the content of VERSION file
if [[ "${QA_IMAGE_NAME}" == "gitlab-ee-qa" ]] && \
[[ "${CI_REGISTRY}" == "dev.gitlab.org:5005" ]] && \
[[ "$(version_file_content)" == *"internal"* ]] && \
[[ "${CI_COMMIT_TITLE}" == "Update VERSION files" ]]; then
[[ "$CI_COMMIT_TITLE" =~ ^Update\ VERSION\ file\ for.*internal ]]; then
QA_IMAGE_FOR_INTERNAL_RELEASE="${BASE_IMAGE_PATH}:$(version_file_content)"
DESTINATIONS="${DESTINATIONS} --tag ${QA_IMAGE_FOR_INTERNAL_RELEASE}"
fi