From e6fe4afb2d5935fcc3f046144111c3d265f85496 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Wed, 19 Aug 2026 15:46:05 +0200 Subject: [PATCH] Add CNO secondary encap CI lanes for 4.20-4.22 and 5.0. Mirror the existing master/5.1 optional metal IPI job so OVN encap override changes are covered on those release branches. Co-authored-by: Cursor --- ...cluster-network-operator-release-4.20.yaml | 9 ++ ...cluster-network-operator-release-4.21.yaml | 9 ++ ...cluster-network-operator-release-4.22.yaml | 9 ++ ...-cluster-network-operator-release-5.0.yaml | 9 ++ ...work-operator-release-4.20-presubmits.yaml | 87 +++++++++++++++++++ ...work-operator-release-4.21-presubmits.yaml | 87 +++++++++++++++++++ ...work-operator-release-4.22-presubmits.yaml | 87 +++++++++++++++++++ ...twork-operator-release-5.0-presubmits.yaml | 87 +++++++++++++++++++ 8 files changed, 384 insertions(+) diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml index eb109f82989d6..43b5e1cfc9787 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml @@ -471,6 +471,15 @@ tests: steps: cluster_profile: equinix-ocp-metal workflow: baremetalds-e2e-ovn-bgp-dualstack-local-gw +- always_run: false + as: e2e-metal-ipi-ovn-secondary-encap + capabilities: + - intranet + optional: true + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + steps: + cluster_profile: equinix-ocp-metal + workflow: cluster-network-operator-ovn-secondary-encap zz_generated_metadata: branch: release-4.20 org: openshift diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml index b1bb8f1df3e81..559264b3079f2 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml @@ -487,6 +487,15 @@ tests: steps: cluster_profile: equinix-ocp-metal workflow: baremetalds-e2e-ovn-bgp-dualstack-local-gw +- always_run: false + as: e2e-metal-ipi-ovn-secondary-encap + capabilities: + - intranet + optional: true + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + steps: + cluster_profile: equinix-ocp-metal + workflow: cluster-network-operator-ovn-secondary-encap zz_generated_metadata: branch: release-4.21 org: openshift diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml index c8d7faff42b91..76cffd0bb6b46 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml @@ -510,6 +510,15 @@ tests: env: FEATURE_SET: TechPreviewNoUpgrade workflow: baremetalds-e2e-ovn-bgp-dualstack-local-gw +- always_run: false + as: e2e-metal-ipi-ovn-secondary-encap + capabilities: + - intranet + optional: true + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + steps: + cluster_profile: equinix-ocp-metal + workflow: cluster-network-operator-ovn-secondary-encap - always_run: false as: e2e-aws-ovn-fdp-qe pipeline_skip_if_only_changed: ^(docs|\.vscode)/|\.md$|^(\.gitignore|\.gitattributes|\.golangci\.yaml|OWNERS|OWNERS_ALIASES|LICENSE|sample-.*\.yaml)$ diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0.yaml index 8847b62c65b7f..79941e15b68cc 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0.yaml @@ -495,6 +495,15 @@ tests: env: FEATURE_SET: TechPreviewNoUpgrade workflow: baremetalds-e2e-ovn-bgp-dualstack-local-gw +- always_run: false + as: e2e-metal-ipi-ovn-secondary-encap + capabilities: + - intranet + optional: true + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + steps: + cluster_profile: equinix-ocp-metal + workflow: cluster-network-operator-ovn-secondary-encap - always_run: false as: e2e-aws-ovn-fdp-qe pipeline_skip_if_only_changed: ^(docs|\.vscode)/|\.md$|^(\.gitignore|\.gitattributes|\.golangci\.yaml|OWNERS|OWNERS_ALIASES|LICENSE|sample-.*\.yaml)$ diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20-presubmits.yaml index d117713885f5d..09309887b6794 100644 --- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20-presubmits.yaml @@ -2269,6 +2269,93 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(e2e-metal-ipi-ovn-ipv6-ipsec|remaining-required),?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.20$ + - ^release-4\.20- + cluster: build12 + context: ci/prow/e2e-metal-ipi-ovn-secondary-encap + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-network-operator-release-4.20-e2e-metal-ipi-ovn-secondary-encap + optional: true + rerun_command: /test e2e-metal-ipi-ovn-secondary-encap + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-metal-ipi-ovn-secondary-encap + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-secondary-encap,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21-presubmits.yaml index cca6f83cf875f..7b6cebc73ba68 100644 --- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21-presubmits.yaml @@ -2478,6 +2478,93 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6-ipsec,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build12 + context: ci/prow/e2e-metal-ipi-ovn-secondary-encap + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-network-operator-release-4.21-e2e-metal-ipi-ovn-secondary-encap + optional: true + rerun_command: /test e2e-metal-ipi-ovn-secondary-encap + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-metal-ipi-ovn-secondary-encap + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-secondary-encap,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22-presubmits.yaml index 705eaa80b8b7d..f90e7b7cb0176 100644 --- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22-presubmits.yaml @@ -2733,6 +2733,93 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6-ipsec,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build12 + context: ci/prow/e2e-metal-ipi-ovn-secondary-encap + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-network-operator-release-4.22-e2e-metal-ipi-ovn-secondary-encap + optional: true + rerun_command: /test e2e-metal-ipi-ovn-secondary-encap + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-metal-ipi-ovn-secondary-encap + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-secondary-encap,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0-presubmits.yaml index 77d98f72623aa..31826f6f00183 100644 --- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-5.0-presubmits.yaml @@ -2730,6 +2730,93 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6-ipsec,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-5\.0$ + - ^release-5\.0- + cluster: build11 + context: ci/prow/e2e-metal-ipi-ovn-secondary-encap + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-network-operator-release-5.0-e2e-metal-ipi-ovn-secondary-encap + optional: true + rerun_command: /test e2e-metal-ipi-ovn-secondary-encap + run_if_changed: ^bindata\/network\/ovn-kubernetes\/common\/008-script-lib\.yaml$|^bindata\/network\/ovn-kubernetes\/(managed|self-hosted)\/ovnkube-node\.yaml$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-metal-ipi-ovn-secondary-encap + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-secondary-encap,?($|\s.*) - agent: kubernetes always_run: false branches: