Merge branch 'fixup-non-based-ubi' into '17-10-stable'

What does this MR do?

Cherry Pick to 17-10-stable

Merge branch 'fixup-non-based-ubi' into 'master'

UBI/FIPS: Fixup container_version when not using gitlab-base

See merge request !2274 (merged)

Merged-by: Balasankar 'Balu' C balasankar@gitlab.com Approved-by: Balasankar 'Balu' C balasankar@gitlab.com Co-authored-by: Jason Plum jplum@gitlab.com

(cherry picked from commit 269c3755)

a6485421 UBI/FIPS: Fixup container_version when not using gitlab-base

Co-authored-by: Balasankar 'Balu' C balasankar@gitlab.com

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