Update ovnk upgrade jobs to use base image 4.18

ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master__4.19-upgrade-from-stable-4.18.yaml

@@ -0,0 +1,70 @@
+base_images:
+  ocp_4.19_base-rhel9:
+    name: "4.19"
+    namespace: ocp
+    tag: base-rhel9
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.23-openshift-4.19
+binary_build_commands: hack/build-go.sh
+build_root:
+  from_repository: true
+images:
+- dockerfile_path: Dockerfile
+  inputs:
+    ocp_4.19_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
+  to: cluster-network-operator
+releases:
+  initial:
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.18"
+  latest:
+    integration:
+      include_built_images: true
+      name: "4.19"
+      namespace: ocp
+resources:
+  '*':
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: e2e-aws-ovn-upgrade
+  optional: true
+  steps:
+    cluster_profile: aws
+    env:
+      EXTRA_MG_ARGS: --host-network
+      TEST_TYPE: upgrade-conformance
+    workflow: openshift-upgrade-aws-ovn
+- as: e2e-azure-ovn-upgrade
+  optional: true
+  steps:
+    cluster_profile: azure4
+    env:
+      EXTRA_MG_ARGS: --host-network
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    workflow: openshift-upgrade-azure-ovn
+- as: e2e-gcp-ovn-upgrade
+  optional: true
+  steps:
+    cluster_profile: gcp-3
+    env:
+      EXTRA_MG_ARGS: --host-network
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    workflow: openshift-upgrade-gcp-ovn
+zz_generated_metadata:
+  branch: master
+  org: openshift
+  repo: cluster-network-operator
+  variant: 4.19-upgrade-from-stable-4.18

ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master__4.18-upgrade-from-stable-4.17.yaml → ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.18__4.18-upgrade-from-stable-4.17.yaml

@@ -64,7 +64,7 @@ tests:
       TEST_TYPE: upgrade-conformance
     workflow: openshift-upgrade-gcp-ovn
 zz_generated_metadata:
-  branch: master
+  branch: release-4.18
   org: openshift
   repo: cluster-network-operator
   variant: 4.18-upgrade-from-stable-4.17

ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.19-upgrade-from-stable-4.18.yaml

@@ -1,41 +1,51 @@
 base_images:
-  ocp_4.17_base-rhel9:
-    name: "4.17"
+  ocp_4.19_base-rhel9:
+    name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.22-openshift-4.18:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    tag: rhel-8-golang-1.22-openshift-4.18
+  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-9-golang-1.22-openshift-4.18
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.23-openshift-4.19
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.22-openshift-4.18:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - dockerfile_path: Dockerfile.microshift
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes-microshift
 releases:
   initial:

ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml

@@ -6,17 +6,17 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build09
-    context: ci/prow/4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
+    context: ci/prow/4.19-upgrade-from-stable-4.18-e2e-aws-ovn-upgrade
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci-operator.openshift.io/variant: 4.18-upgrade-from-stable-4.17
+      ci-operator.openshift.io/variant: 4.19-upgrade-from-stable-4.18
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
+    name: pull-ci-openshift-cluster-network-operator-master-4.19-upgrade-from-stable-4.18-e2e-aws-ovn-upgrade
     optional: true
-    rerun_command: /test 4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
+    rerun_command: /test 4.19-upgrade-from-stable-4.18-e2e-aws-ovn-upgrade
     spec:
       containers:
       - args:
@@ -26,7 +26,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
         - --target=e2e-aws-ovn-upgrade
-        - --variant=4.18-upgrade-from-stable-4.17
+        - --variant=4.19-upgrade-from-stable-4.18
         command:
         - ci-operator
         image: ci-operator:latest
@@ -74,24 +74,24 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )4.19-upgrade-from-stable-4.18-e2e-aws-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade
+    context: ci/prow/4.19-upgrade-from-stable-4.18-e2e-azure-ovn-upgrade
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
-      ci-operator.openshift.io/variant: 4.18-upgrade-from-stable-4.17
+      ci-operator.openshift.io/variant: 4.19-upgrade-from-stable-4.18
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade
+    name: pull-ci-openshift-cluster-network-operator-master-4.19-upgrade-from-stable-4.18-e2e-azure-ovn-upgrade
     optional: true
-    rerun_command: /test 4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade
+    rerun_command: /test 4.19-upgrade-from-stable-4.18-e2e-azure-ovn-upgrade
     spec:
       containers:
       - args:
@@ -101,7 +101,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
         - --target=e2e-azure-ovn-upgrade
-        - --variant=4.18-upgrade-from-stable-4.17
+        - --variant=4.19-upgrade-from-stable-4.18
         command:
         - ci-operator
         image: ci-operator:latest
@@ -149,24 +149,24 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )4.19-upgrade-from-stable-4.18-e2e-azure-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-upgrade
+    context: ci/prow/4.19-upgrade-from-stable-4.18-e2e-gcp-ovn-upgrade
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp-3
-      ci-operator.openshift.io/variant: 4.18-upgrade-from-stable-4.17
+      ci-operator.openshift.io/variant: 4.19-upgrade-from-stable-4.18
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-upgrade
+    name: pull-ci-openshift-cluster-network-operator-master-4.19-upgrade-from-stable-4.18-e2e-gcp-ovn-upgrade
     optional: true
-    rerun_command: /test 4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-upgrade
+    rerun_command: /test 4.19-upgrade-from-stable-4.18-e2e-gcp-ovn-upgrade
     spec:
       containers:
       - args:
@@ -176,7 +176,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
         - --target=e2e-gcp-ovn-upgrade
-        - --variant=4.18-upgrade-from-stable-4.17
+        - --variant=4.19-upgrade-from-stable-4.18
         command:
         - ci-operator
         image: ci-operator:latest
@@ -224,29 +224,29 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )4.19-upgrade-from-stable-4.18-e2e-gcp-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/4.18-upgrade-from-stable-4.17-images
+    context: ci/prow/4.19-upgrade-from-stable-4.18-images
     decorate: true
     labels:
-      ci-operator.openshift.io/variant: 4.18-upgrade-from-stable-4.17
+      ci-operator.openshift.io/variant: 4.19-upgrade-from-stable-4.18
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-images
-    rerun_command: /test 4.18-upgrade-from-stable-4.17-images
+    name: pull-ci-openshift-cluster-network-operator-master-4.19-upgrade-from-stable-4.18-images
+    rerun_command: /test 4.19-upgrade-from-stable-4.18-images
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --variant=4.18-upgrade-from-stable-4.17
+        - --variant=4.19-upgrade-from-stable-4.18
         command:
         - ci-operator
         image: ci-operator:latest
@@ -279,7 +279,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )4.18-upgrade-from-stable-4.17-images,?($|\s.*)
+    trigger: (?m)^/test( | .* )4.19-upgrade-from-stable-4.18-images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: