Skip to content

(Backport to 18.1) fix: Don't unset IMAGE_TAG_EXT passed by gitlab-org/gitlab

Siddharth Kannanrequested to merge
sk/backport-18-1/dont-unset-tag-extension-trigger-var into 18-1-stable

What does this MR do?

Backport !2453 (merged) to 18.1.

fix: Don't unset IMAGE_TAG_EXT passed by gitlab-org/gitlab

gitlab-org/gitlab passes the value of IMAGE_TAG_EXT as a trigger variable when building Docker images that are used within the release-environments. This variable was being used in 18.0. In 03d460b3, the variable started being unset even when it was set to a value that was not related to ubi or fips. This caused deployments to the release-environments to start failing for the 18-1-stable-ee branch of gitlab-org/security/gitlab.

This patch updates the code to unset IMAGE_TAG_EXT only when it ends with -ubi or -fips

Fixes https://gitlab.com/gitlab-org/release/tasks/-/issues/19956

Related issues

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Integration tests added to GitLab QA
  • The impact any change in container size has should be evaluated
  • New dependencies are managed with GitLab forked renovatebot
Edited by Siddharth Kannan

Merge request reports