From 2efae00f375cda306a832add88bb0c6d00db983f Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 23 Jan 2025 15:20:40 +0000 Subject: [PATCH] UPSTREAM: : Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/ebb4b1b99933c53c1d5953d9a03ecf023c4187f9/images/openshift-enterprise-ansible-operator.yml --- .ci-operator.yaml | 2 +- openshift/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 64887a08..7c15f83e 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.22-openshift-4.18 + tag: rhel-9-release-golang-1.23-openshift-4.19 diff --git a/openshift/Dockerfile b/openshift/Dockerfile index 7e3f28ef..f7afd079 100644 --- a/openshift/Dockerfile +++ b/openshift/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder ENV GO111MODULE=on \ GOFLAGS=-mod=vendor @@ -9,7 +9,7 @@ RUN cd /go/src/github.com/openshift/ansible-operator-plugins \ && export GIT_VERSION="$(make -pRrq --no-print-directory | grep '^IMAGE_VERSION' | awk -F'= ' '{print $2}')-ocp" \ && make -e build -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 RUN mkdir -p /etc/ansible \ && echo "localhost ansible_connection=local" > /etc/ansible/hosts \