diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 38718883ba79..a83f0f843070 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -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 diff --git a/images/hello-openshift/Dockerfile.rhel b/images/hello-openshift/Dockerfile.rhel index 56a18e2f78fa..63fe636d4ead 100644 --- a/images/hello-openshift/Dockerfile.rhel +++ b/images/hello-openshift/Dockerfile.rhel @@ -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 diff --git a/images/tests/Dockerfile.rhel b/images/tests/Dockerfile.rhel index b18cf59c055e..5940b7bbe42a 100644 --- a/images/tests/Dockerfile.rhel +++ b/images/tests/Dockerfile.rhel @@ -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; \ @@ -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 && \ yum install --setopt=tsflags=nodocs -y $PACKAGES && \ yum update -y python3-six && \ yum clean all && rm -rf /var/cache/yum/* && \