Skip to content

OCPBUGS-20097: Migrate tools image to RHEL9 #28733

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 2 commits into from
Apr 24, 2024
Merged

OCPBUGS-20097: Migrate tools image to RHEL9 #28733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9128372
OCPBUGS-20097: Migrate tools image to RHEL9
soltysh Apr 23, 2024
2b4e6f7
Tests to rhel9
joepvd Apr 23, 2024
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 .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.21-openshift-4.16
tag: rhel-9-release-golang-1.21-openshift-4.16
4 changes: 2 additions & 2 deletions images/hello-openshift/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
WORKDIR /go/src/github.com/openshift/hello-openshift
COPY examples/hello-openshift .
RUN go build -o /hello-openshift

FROM registry.ci.openshift.org/ocp/4.14:base
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
COPY --from=builder /hello-openshift /hello-openshift
EXPOSE 8080 8888
USER 1001
Expand Down
4 changes: 2 additions & 2 deletions images/tests/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
WORKDIR /go/src/github.com/openshift/origin
COPY . .
RUN make; \
Expand All @@ -12,7 +12,7 @@ COPY --from=builder /go/src/github.com/openshift/origin/zz_generated.manifests/*

RUN PACKAGES="git gzip util-linux" && \
if [ $HOSTTYPE = x86_64 ]; then PACKAGES="$PACKAGES python3-cinderclient"; fi && \
if [ $HOSTTYPE = x86_64 ]; then PACKAGES="$PACKAGES rt-tests rteval"; fi && \
if [ $HOSTTYPE = x86_64 ]; then PACKAGES="$PACKAGES realtime-tests rteval"; fi && \

@dinhxuanvu dinhxuanvu Apr 23, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The CI reports No match for argument: realtime-tests. So this rpm is not available?

@soltysh soltysh Apr 23, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Wrong base image is being used, it's rhel8, and should be rhel9

yum install --setopt=tsflags=nodocs -y $PACKAGES && \
yum update -y python3-six && \
yum clean all && rm -rf /var/cache/yum/* && \
Expand Down