Pipeline: Fixup gitlab-base version calculation 18-6 backport

Jon Dovestonrequested to merge
fix-gitlab-base-version-calc-18-6 into 18-6-stable

What does this MR do?

Pipeline: Fixup gitlab-base version calculation

Fixup the gitlab-base container version calculation to use UBI_MICRO_DIGEST instead of UBI_DIGEST.

When these two were swapped for other images, this item was apparently missed. As a result, there could be a misalignment between the base container and others in the pipeline. This evidenced itself within at least one instance, where the final service images did not have aligned library versions. This resulted in use shipping broken images based on gitlab-ruby, which should have been rebuilt.

Cherry picked from !2723 (merged)

Changelog: fixed

Related issues

Related to https://gitlab.com/gitlab-org/build/CNG/-/work_items/2282

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 Jason Plum

Merge request reports