diff --git a/openshift/ci-operator/Dockerfile.in b/openshift/ci-operator/Dockerfile.in index 7d6db19a07ac..0dfc4b409355 100644 --- a/openshift/ci-operator/Dockerfile.in +++ b/openshift/ci-operator/Dockerfile.in @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . RUN make install test-install diff --git a/openshift/ci-operator/Dockerfile_with_kodata.in b/openshift/ci-operator/Dockerfile_with_kodata.in index 69ab9b50c474..f472db91d677 100644 --- a/openshift/ci-operator/Dockerfile_with_kodata.in +++ b/openshift/ci-operator/Dockerfile_with_kodata.in @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . RUN make install test-install diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index 450d6429666a..06d81848d16e 100644 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder # Add kubernetes repository ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/ diff --git a/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile index 6d40bc9da976..43460aee761f 100644 --- a/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . diff --git a/openshift/ci-operator/knative-perf-images/load-test/Dockerfile b/openshift/ci-operator/knative-perf-images/load-test/Dockerfile index 08dc973f1399..70514dc4d89a 100644 --- a/openshift/ci-operator/knative-perf-images/load-test/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/load-test/Dockerfile @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . diff --git a/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile b/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile index 5d1e7c6af8da..4ffbc5eeda76 100644 --- a/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . diff --git a/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile b/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile index 36d674fe85e8..294fa6c136b3 100644 --- a/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . diff --git a/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile index 8f3b2737abc9..aa2c58855d45 100644 --- a/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . diff --git a/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile b/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile index b2246199b354..cd3c12bbb78b 100644 --- a/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile @@ -1,5 +1,5 @@ # Do not edit! This file was generated via Makefile -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . diff --git a/openshift/performance/patches/perf.patch b/openshift/performance/patches/perf.patch index 90260b421be5..d153f2579594 100644 --- a/openshift/performance/patches/perf.patch +++ b/openshift/performance/patches/perf.patch @@ -40,7 +40,7 @@ index 1c31865cc..7bd47161b 100644 --- a/openshift/ci-operator/Dockerfile.in +++ b/openshift/ci-operator/Dockerfile.in @@ -2,7 +2,7 @@ - FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder + FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . -RUN make install test-install @@ -53,7 +53,7 @@ index 9d84e5ecc..572d91c25 100644 --- a/openshift/ci-operator/Dockerfile_with_kodata.in +++ b/openshift/ci-operator/Dockerfile_with_kodata.in @@ -2,7 +2,7 @@ - FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder + FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as builder COPY . . -RUN make install test-install