Restore proper contents to toolbox ubi8 image
What does this MR do?
The task-runner ubi dockerfile was improperly copied over to the toolbox name. Fixed that here.
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
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
Merge request reports
Activity
changed milestone to %14.3
added groupdistribution priority2 regression:14.2 severity2 typebug labels
assigned to @twk3
added Pick into 14.2 label
added workflowready for review label
Setting label(s) devopsenablement sectionenablement based on groupdistribution.
added devopssystems sectioncore platform labels
added workflowin review label and removed workflowready for review label
requested review from @mnielsen
Thanks for catching this DJ
Looks like we missed this in !712 (merged).The change looks good to me:
-
I recreated it by taking the original
gitlab-task-runner/Dockerfile.ubi8
from !712 (merged) and replacingtask-runner
withtoolbox
, getting the same result supplied in this MR. -
I see the pipelines are green and I can pull down the Toolbox UBI8 image and it runs as expected.
-
Also confirmed
toolbox
andtask-runner
UBI8 images have the same ID:$ docker inspect registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:restore-toolbox-ubi8-image-ubi8 | jq '.[].Id' "sha256:243ccde4c4013485c9f22b316acf4a5aa75988507e0a33e739b2fb215090dac8" $ docker inspect registry.gitlab.com/gitlab-org/build/cng/gitlab-task-runner-ee:restore-toolbox-ubi8-image-ubi8 | jq '.[].Id' "sha256:243ccde4c4013485c9f22b316acf4a5aa75988507e0a33e739b2fb215090dac8"
-
requested review from @WarheadsSE
As a side note, when looking at this I was curious whether we actually need
gitlab-task-runner/Dockerfile{,.ubi8}
anymore. Opened gitlab-org/charts/gitlab#2870 (moved) to track.mentioned in commit 68c9feba
mentioned in merge request dsop-scripts!25 (merged)
picked the changes into the branch
14-2-stable-patch-3
with commit a7a687e5Automatically picked into !748 (merged), will merge into
14-2-stable
ready for14.2.3
.mentioned in commit a7a687e5
removed Pick into 14.2 label
mentioned in merge request !748 (merged)