From 0e0b3f5dc0b9992fed3d89c5e72b59c7ee127aa9 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 5 Sep 2024 00:30:26 +0000 Subject: [PATCH] Updating ose-libvirt-machine-controllers-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-libvirt-machine-controllers.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel7 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 38718883b..64887a08b 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.22-openshift-4.18 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index ca32fb759..5f35516f4 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,11 +1,11 @@ -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.22-openshift-4.18 AS builder RUN yum install -y libvirt-devel WORKDIR /go/src/github.com/openshift/cluster-api-provider-libvirt COPY . . RUN go build -o machine-controller-manager ./cmd/manager -FROM registry.ci.openshift.org/ocp/4.16:base +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 RUN INSTALL_PKGS=" \ libvirt-libs openssh-clients xorriso \ " && \