Skip to content

[release-4.15] USHIFT-2810: update multiplatform builder image #3206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 4, 2024
Merged

[release-4.15] USHIFT-2810: update multiplatform builder image #3206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ GO_TEST_PACKAGES=./cmd/... ./pkg/...
export CGO_ENABLED ?= 1

# Specify OCP build tools image tag when building rpm with podman
RPM_BUILDER_IMAGE_TAG := rhel-9-golang-latest-openshift-4.15
RPM_BUILDER_IMAGE_TAG := rhel-9-golang-1.20-builder-multi-openshift-4.16
Copy link
Copy Markdown
Contributor

@ggiguash ggiguash Apr 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add an explanation in the comment on why we're using 4.16 package.


all: generate-config microshift etcd

Expand Down
2 changes: 1 addition & 1 deletion packaging/images/Containerfile.rpm-builder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG TAG
FROM registry.ci.openshift.org/ocp-multi/builder:$TAG
FROM registry.ci.openshift.org/ocp/builder:$TAG
Copy link
Copy Markdown
Contributor

@pacevedom pacevedom Apr 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this multiarch too?

Copy link
Copy Markdown
Contributor Author

@eslutsky eslutsky Apr 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, validated with :

oc image info registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 --filter-by-os linux/arm64

Copy link
Copy Markdown
Contributor Author

@eslutsky eslutsky Apr 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like rhel-9-golang-1.20-openshift-4.15 tag doesnt work with arm, so we must use rhel-9-golang-1.20-builder-multi-openshift-4.16 which is the same image but mutli arch.


RUN rm -rfv /etc/yum.repos.d/ci-rpm-mirrors.repo /etc/yum.repos.d/localdev* && \
dnf install \
Expand Down