From d2777e8088334550f320653e0bf8b9c4cc718578 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Tue, 21 Jul 2026 09:49:25 -0700 Subject: [PATCH] add optional dualstack-v6primary for k8s 4.20, 4.21 always_run: false Signed-off-by: Jamo Luhrsen --- .../openshift-kubernetes-release-4.20.yaml | 8 ++ .../openshift-kubernetes-release-4.21.yaml | 8 ++ ...ft-kubernetes-release-4.20-presubmits.yaml | 90 +++++++++++++++++++ ...ft-kubernetes-release-4.21-presubmits.yaml | 90 +++++++++++++++++++ 4 files changed, 196 insertions(+) diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml index d50cbfbae4885..5b19d3807b16c 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml @@ -411,6 +411,14 @@ tests: IP_STACK=v4v6 NETWORK_TYPE=OVNKubernetes workflow: baremetalds-e2e +- always_run: false + as: e2e-openstack-dualstack-v6primary + optional: true + steps: + cluster_profile: openstack-hwoffload + env: + CONFIG_TYPE: dualstack-v6primary + workflow: openshift-e2e-openstack-dualstack - always_run: false as: configmap-scale steps: diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml index fb10d78023863..061af4c145d92 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml @@ -411,6 +411,14 @@ tests: IP_STACK=v4v6 NETWORK_TYPE=OVNKubernetes workflow: baremetalds-e2e +- always_run: false + as: e2e-openstack-dualstack-v6primary + optional: true + steps: + cluster_profile: openstack-hwoffload + env: + CONFIG_TYPE: dualstack-v6primary + workflow: openshift-e2e-openstack-dualstack - always_run: false as: configmap-scale steps: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml index a4596bbb051b8..435a8cfe56953 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml @@ -2745,6 +2745,96 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack-csi-manila,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.20$ + - ^release-4\.20- + cluster: build03 + context: ci/prow/e2e-openstack-dualstack-v6primary + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - build/pause/Dockerfile.Rhel + - openshift-hack/images/hyperkube/Dockerfile.rhel + - openshift-hack/images/installer-kube-apiserver-artifacts/Dockerfile.rhel + - openshift-hack/images/kube-proxy/Dockerfile.rhel + - openshift-hack/images/tests/Dockerfile.rhel + labels: + ci-operator.openshift.io/cloud: openstack-hwoffload + ci-operator.openshift.io/cloud-cluster-profile: openstack-hwoffload + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kubernetes-release-4.20-e2e-openstack-dualstack-v6primary + optional: true + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-openstack-dualstack-v6primary + 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-openstack-dualstack-v6primary + 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-openstack-dualstack-v6primary,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml index 0d8f47f1d89b0..78064263558ed 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml @@ -2835,6 +2835,96 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack-csi-manila,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build03 + context: ci/prow/e2e-openstack-dualstack-v6primary + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - build/pause/Dockerfile.Rhel + - openshift-hack/images/hyperkube/Dockerfile.rhel + - openshift-hack/images/installer-kube-apiserver-artifacts/Dockerfile.rhel + - openshift-hack/images/kube-proxy/Dockerfile.rhel + - openshift-hack/images/tests/Dockerfile.rhel + labels: + ci-operator.openshift.io/cloud: openstack-hwoffload + ci-operator.openshift.io/cloud-cluster-profile: openstack-hwoffload + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kubernetes-release-4.21-e2e-openstack-dualstack-v6primary + optional: true + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-openstack-dualstack-v6primary + 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-openstack-dualstack-v6primary + 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-openstack-dualstack-v6primary,?($|\s.*) - agent: kubernetes always_run: false branches: