diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml index 5c01142e02c76..56b374d1d0d21 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml @@ -7,15 +7,15 @@ base_images: name: "4.14" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: name: builder namespace: ocp - tag: rhel-9-golang-1.19-openshift-4.14 + tag: rhel-9-golang-1.20-openshift-4.14 build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.18 + tag: golang-1.19 images: - dockerfile_path: Dockerfile.base inputs: @@ -26,16 +26,16 @@ images: - dockerfile_path: Dockerfile from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes - dockerfile_path: Dockerfile.microshift from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-microshift promotion: name: "4.14" diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml index a474314451e2f..ca7d3ac86de41 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml @@ -3,10 +3,10 @@ base_images: name: "4.14" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: name: builder namespace: ocp - tag: rhel-9-golang-1.19-openshift-4.14 + tag: rhel-9-golang-1.20-openshift-4.14 build_root: from_repository: true images: @@ -19,16 +19,16 @@ images: - dockerfile_path: Dockerfile from: ovn-kubernetes-base-rhel-9 inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-rhel-9 - dockerfile_path: Dockerfile.microshift from: ovn-kubernetes-base-rhel-9 inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-microshift-rhel-9 releases: initial: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml index 0d332cb2ef22a..22ecbd729941c 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml @@ -3,10 +3,10 @@ base_images: name: "4.14" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: name: builder namespace: ocp - tag: rhel-9-golang-1.19-openshift-4.14 + tag: rhel-9-golang-1.20-openshift-4.14 build_root: from_repository: true images: @@ -19,16 +19,16 @@ images: - dockerfile_path: Dockerfile from: ovn-kubernetes-base-rhel-9 inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-rhel-9 - dockerfile_path: Dockerfile.microshift from: ovn-kubernetes-base-rhel-9 inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-microshift-rhel-9 releases: initial: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd.yaml index fdb607276ed31..2e351c3f424e9 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd.yaml @@ -3,10 +3,10 @@ base_images: name: "4.14" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: name: builder namespace: ocp - tag: rhel-9-golang-1.19-openshift-4.14 + tag: rhel-9-golang-1.20-openshift-4.14 build_root: from_repository: true images: @@ -19,16 +19,16 @@ images: - dockerfile_path: Dockerfile from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes - dockerfile_path: Dockerfile.microshift from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-microshift releases: initial: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.14.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.14.yaml index ccef5289fd802..024941bf3f27c 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.14.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.14.yaml @@ -7,15 +7,15 @@ base_images: name: "4.14" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: name: builder namespace: ocp - tag: rhel-9-golang-1.19-openshift-4.14 + tag: rhel-9-golang-1.20-openshift-4.14 build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.18 + tag: golang-1.19 images: - dockerfile_path: Dockerfile.base inputs: @@ -26,16 +26,16 @@ images: - dockerfile_path: Dockerfile from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes - dockerfile_path: Dockerfile.microshift from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-microshift promotion: disabled: true diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml index 0fac3ce8c9497..bfec7f21a1922 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml @@ -7,15 +7,15 @@ base_images: name: "4.15" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: name: builder namespace: ocp - tag: rhel-9-golang-1.19-openshift-4.14 + tag: rhel-9-golang-1.20-openshift-4.14 build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.18 + tag: golang-1.19 images: - dockerfile_path: Dockerfile.base inputs: @@ -26,16 +26,16 @@ images: - dockerfile_path: Dockerfile from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes - dockerfile_path: Dockerfile.microshift from: ovn-kubernetes-base inputs: - ocp_builder_rhel-9-golang-1.19-openshift-4.14: + ocp_builder_rhel-9-golang-1.20-openshift-4.14: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 to: ovn-kubernetes-microshift promotion: name: "4.15"