add -ovn- to cluster-control-plane-machine-set-operator

this will fix some flakes that are checking that the job name contains the string of the underlying CNI, which is ovn by default in 4.12+ found with this one-liner: ❯ w3m -dump -cols 200 "https://search.ci.openshift.org/?maxAge=96h&type=junit&search=job+name.*does+not+have+network+type+in+name.*expected.*ovn" | sed -n 's/^\([^ ]*\) .*failures match.*/\1/p' | sort | rg cluster-control-plane-machine-set-operator pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-serial pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-upgrade pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-serial pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-upgrade Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
openshift · Jan 17, 2023 · d55ab9c · d55ab9c
1 parent e97b6dd
commit d55ab9c
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 104 deletions.
diff --git a/...plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml b/...plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml
@@ -73,12 +73,12 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws

diff --git a/...chine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12.yaml b/...chine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12.yaml
@@ -73,12 +73,12 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws

diff --git a/...chine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13.yaml b/...chine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13.yaml
@@ -74,12 +74,12 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws

diff --git a/...chine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.14.yaml b/...chine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.14.yaml
@@ -73,12 +73,12 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws

diff --git a/...ne-set-operator/openshift-cluster-control-plane-machine-set-operator-main-presubmits.yaml b/...ne-set-operator/openshift-cluster-control-plane-machine-set-operator-main-presubmits.yaml
@@ -224,17 +224,16 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build03
-    context: ci/prow/e2e-aws-periodic-pre
+    context: ci/prow/e2e-aws-ovn-serial
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-periodic-pre
-    optional: true
-    rerun_command: /test e2e-aws-periodic-pre
-    run_if_changed: .*periodic.*
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-ovn-serial
+    rerun_command: /test e2e-aws-ovn-serial
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -243,8 +242,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-periodic-pre-cluster-profile
-        - --target=e2e-aws-periodic-pre
+        - --secret-dir=/usr/local/e2e-aws-ovn-serial-cluster-profile
+        - --target=e2e-aws-ovn-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -260,7 +259,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-periodic-pre-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -291,22 +290,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-periodic-pre,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-serial,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^main$
     - ^main-
     cluster: build03
-    context: ci/prow/e2e-aws-serial
+    context: ci/prow/e2e-aws-ovn-upgrade
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-serial
-    rerun_command: /test e2e-aws-serial
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-ovn-upgrade
+    rerun_command: /test e2e-aws-ovn-upgrade
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -316,8 +315,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
-        - --target=e2e-aws-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-upgrade-cluster-profile
+        - --target=e2e-aws-ovn-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -333,7 +332,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -364,23 +363,24 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^main$
     - ^main-
     cluster: build03
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-aws-periodic-pre
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-periodic-pre
+    optional: true
+    rerun_command: /test e2e-aws-periodic-pre
+    run_if_changed: .*periodic.*
     spec:
       containers:
       - args:
@@ -389,8 +389,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-aws-periodic-pre-cluster-profile
+        - --target=e2e-aws-periodic-pre
         command:
         - ci-operator
         image: ci-operator:latest
@@ -406,7 +406,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-periodic-pre-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -437,7 +437,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-periodic-pre,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:

diff --git a/...perator/openshift-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml b/...perator/openshift-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml
@@ -224,17 +224,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-periodic-pre
+    context: ci/prow/e2e-aws-ovn-serial
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-periodic-pre
-    optional: true
-    rerun_command: /test e2e-aws-periodic-pre
-    run_if_changed: .*periodic.*
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-ovn-serial
+    rerun_command: /test e2e-aws-ovn-serial
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -243,8 +242,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-periodic-pre-cluster-profile
-        - --target=e2e-aws-periodic-pre
+        - --secret-dir=/usr/local/e2e-aws-ovn-serial-cluster-profile
+        - --target=e2e-aws-ovn-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -260,7 +259,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-periodic-pre-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -291,22 +290,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-periodic-pre,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-serial,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-serial
+    context: ci/prow/e2e-aws-ovn-upgrade
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-serial
-    rerun_command: /test e2e-aws-serial
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-ovn-upgrade
+    rerun_command: /test e2e-aws-ovn-upgrade
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -316,8 +315,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
-        - --target=e2e-aws-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-upgrade-cluster-profile
+        - --target=e2e-aws-ovn-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -333,7 +332,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -364,23 +363,24 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-aws-periodic-pre
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-periodic-pre
+    optional: true
+    rerun_command: /test e2e-aws-periodic-pre
+    run_if_changed: .*periodic.*
     spec:
       containers:
       - args:
@@ -389,8 +389,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-aws-periodic-pre-cluster-profile
+        - --target=e2e-aws-periodic-pre
         command:
         - ci-operator
         image: ci-operator:latest
@@ -406,7 +406,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-periodic-pre-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -437,7 +437,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-periodic-pre,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: