make explicit baremetalds-e2e-sdn-serial-compact workflow

- applies only to 4.12
- eventually, OVNKubernetes will be the default
CNI. This renames the existing OpenShiftSDN job(s)
to explicitly use OpenShiftSDN to ensure coverage
remains for that when the default CNI changes.

Signed-of-fby: Jamo Luhrsen <[email protected]>

Author: jluhrsen

ci-operator/config/openshift/release/openshift-release-master__nightly-4.12.yaml

@@ -177,11 +177,11 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ovn-dualstack
-- as: e2e-metal-ipi-serial-compact
+- as: e2e-metal-sdn-ipi-serial-compact
   interval: 48h
   steps:
     cluster_profile: equinix-ocp-metal
-    workflow: baremetalds-e2e-serial-compact
+    workflow: baremetalds-e2e-sdn-serial-compact
 - as: e2e-metal-ipi-upgrade
   cron: 0 0 1 1 *
   steps:

ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml

@@ -36031,7 +36031,7 @@ periodics:
   - base_ref: master
     org: openshift
     repo: release
-  interval: 48h
+  interval: 6h
   labels:
     ci-operator.openshift.io/cloud: equinix-ocp-metal
     ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
@@ -36040,7 +36040,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-compact
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ipv4
   spec:
     containers:
     - args:
@@ -36049,8 +36049,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-serial-compact-cluster-profile
-      - --target=e2e-metal-ipi-serial-compact
+      - --secret-dir=/usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
+      - --target=e2e-metal-ipi-serial-ipv4
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36067,7 +36067,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-serial-compact-cluster-profile
+      - mountPath: /usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -36107,7 +36107,7 @@ periodics:
   - base_ref: master
     org: openshift
     repo: release
-  interval: 6h
+  interval: 48h
   labels:
     ci-operator.openshift.io/cloud: equinix-ocp-metal
     ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
@@ -36116,7 +36116,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ipv4
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ovn-dualstack
   spec:
     containers:
     - args:
@@ -36125,8 +36125,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
-      - --target=e2e-metal-ipi-serial-ipv4
+      - --secret-dir=/usr/local/e2e-metal-ipi-serial-ovn-dualstack-cluster-profile
+      - --target=e2e-metal-ipi-serial-ovn-dualstack
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36143,7 +36143,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
+      - mountPath: /usr/local/e2e-metal-ipi-serial-ovn-dualstack-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -36192,7 +36192,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ovn-dualstack
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ovn-ipv6
   spec:
     containers:
     - args:
@@ -36201,8 +36201,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-serial-ovn-dualstack-cluster-profile
-      - --target=e2e-metal-ipi-serial-ovn-dualstack
+      - --secret-dir=/usr/local/e2e-metal-ipi-serial-ovn-ipv6-cluster-profile
+      - --target=e2e-metal-ipi-serial-ovn-ipv6
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36219,7 +36219,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-serial-ovn-dualstack-cluster-profile
+      - mountPath: /usr/local/e2e-metal-ipi-serial-ovn-ipv6-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -36268,7 +36268,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ovn-ipv6
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-virtualmedia
   spec:
     containers:
     - args:
@@ -36277,8 +36277,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-serial-ovn-ipv6-cluster-profile
-      - --target=e2e-metal-ipi-serial-ovn-ipv6
+      - --secret-dir=/usr/local/e2e-metal-ipi-serial-virtualmedia-cluster-profile
+      - --target=e2e-metal-ipi-serial-virtualmedia
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36295,7 +36295,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-serial-ovn-ipv6-cluster-profile
+      - mountPath: /usr/local/e2e-metal-ipi-serial-virtualmedia-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -36328,14 +36328,15 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
+  cron: 0 0 1 1 *
   decorate: true
   decoration_config:
     skip_cloning: true
+    timeout: 5h0m0s
   extra_refs:
   - base_ref: master
     org: openshift
     repo: release
-  interval: 48h
   labels:
     ci-operator.openshift.io/cloud: equinix-ocp-metal
     ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
@@ -36344,7 +36345,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-virtualmedia
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-upgrade
   spec:
     containers:
     - args:
@@ -36353,8 +36354,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-serial-virtualmedia-cluster-profile
-      - --target=e2e-metal-ipi-serial-virtualmedia
+      - --secret-dir=/usr/local/e2e-metal-ipi-upgrade-cluster-profile
+      - --target=e2e-metal-ipi-upgrade
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36371,7 +36372,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-serial-virtualmedia-cluster-profile
+      - mountPath: /usr/local/e2e-metal-ipi-upgrade-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -36421,7 +36422,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-upgrade
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-upgrade-ovn-ipv6
   spec:
     containers:
     - args:
@@ -36430,8 +36431,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-upgrade-cluster-profile
-      - --target=e2e-metal-ipi-upgrade
+      - --secret-dir=/usr/local/e2e-metal-ipi-upgrade-ovn-ipv6-cluster-profile
+      - --target=e2e-metal-ipi-upgrade-ovn-ipv6
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36448,7 +36449,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-upgrade-cluster-profile
+      - mountPath: /usr/local/e2e-metal-ipi-upgrade-ovn-ipv6-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -36481,11 +36482,10 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 0 0 1 1 *
+  cron: 0 0 * * 1
   decorate: true
   decoration_config:
     skip_cloning: true
-    timeout: 5h0m0s
   extra_refs:
   - base_ref: master
     org: openshift
@@ -36498,7 +36498,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-upgrade-ovn-ipv6
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-virtualmedia
   spec:
     containers:
     - args:
@@ -36507,8 +36507,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-upgrade-ovn-ipv6-cluster-profile
-      - --target=e2e-metal-ipi-upgrade-ovn-ipv6
+      - --secret-dir=/usr/local/e2e-metal-ipi-virtualmedia-cluster-profile
+      - --target=e2e-metal-ipi-virtualmedia
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36525,7 +36525,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-upgrade-ovn-ipv6-cluster-profile
+      - mountPath: /usr/local/e2e-metal-ipi-virtualmedia-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -36558,14 +36558,14 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 0 0 * * 1
   decorate: true
   decoration_config:
     skip_cloning: true
   extra_refs:
   - base_ref: master
     org: openshift
     repo: release
+  interval: 48h
   labels:
     ci-operator.openshift.io/cloud: equinix-ocp-metal
     ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
@@ -36574,7 +36574,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-virtualmedia
+  name: periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-sdn-ipi-serial-compact
   spec:
     containers:
     - args:
@@ -36583,8 +36583,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-metal-ipi-virtualmedia-cluster-profile
-      - --target=e2e-metal-ipi-virtualmedia
+      - --secret-dir=/usr/local/e2e-metal-sdn-ipi-serial-compact-cluster-profile
+      - --target=e2e-metal-sdn-ipi-serial-compact
       - --variant=nightly-4.12
       command:
       - ci-operator
@@ -36601,7 +36601,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-metal-ipi-virtualmedia-cluster-profile
+      - mountPath: /usr/local/e2e-metal-sdn-ipi-serial-compact-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials

ci-operator/step-registry/baremetalds/e2e/sdn/OWNERS

@@ -0,0 +1 @@
+../OWNERS

ci-operator/step-registry/baremetalds/e2e/sdn/serial/OWNERS

@@ -0,0 +1 @@
+../OWNERS

ci-operator/step-registry/baremetalds/e2e/sdn/serial/compact/OWNERS

@@ -0,0 +1 @@
+../OWNERS

ci-operator/step-registry/baremetalds/e2e/sdn/serial/compact/baremetalds-e2e-sdn-serial-compact-workflow.metadata.json

@@ -0,0 +1,13 @@
+{
+	"path": "baremetalds/e2e/sdn/serial/compact/baremetalds-e2e-sdn-serial-compact-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"andfasano",
+			"ardaguclu",
+			"derekhiggins",
+			"elfosardo",
+			"honza",
+			"stbenjam"
+		]
+	}
+}

ci-operator/step-registry/baremetalds/e2e/sdn/serial/compact/baremetalds-e2e-sdn-serial-compact-workflow.yaml

@@ -0,0 +1,21 @@
+workflow:
+  as: baremetalds-e2e-sdn-serial-compact
+  steps:
+    pre:
+      - chain: baremetalds-ipi-pre
+    test:
+      - ref: baremetalds-e2e-test
+    post:
+      - chain: baremetalds-ipi-post
+    env:
+      TEST_SUITE: "openshift/conformance/serial"
+      TEST_SKIPS: ""
+      DEVSCRIPTS_CONFIG: |
+        IP_STACK=v6
+        NUM_WORKERS=0
+        NUM_EXTRA_WORKERS=1
+        APPLY_EXTRA_WORKERS=true
+        NETWORK_TYPE=OpenShiftSDN
+  documentation: |-
+    This workflow executes the ipv6 compact end-to-end serial test suite on a cluster provisioned by running dev-scripts
+    on a packet server using the OpenShiftSDN CNI.