Merge branch '4747-fix-image-branch-naming' into '6-11-stable'

What does this MR do?

Merge branch '4747-fix-image-branch-naming' into '6-11-stable'

Fix image branch naming assumptions in autodevops.sh

See merge request !3204 (merged)

Merged-by: Jason Plum <jplum@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Jason Young <jyoung@gitlab.com>

(cherry picked from commit d6ea7eccadbc19273b858a90fb4d58472b334959)

4b8a4f95 Fix image branch naming assumptions in autodevops.sh

Related issues

Backport for #4747 (closed)

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
• Tests added
• Integration tests added to GitLab QA
• Equivalent MR/issue for omnibus-gitlab opened
• Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.