openshift · alebedev87 · Jan 26, 2023
diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml
@@ -51,25 +51,25 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   steps:
     cluster_profile: aws
     workflow: openshift-upgrade-aws
-- as: e2e-gcp-serial
+- as: e2e-gcp-ovn-serial
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-serial
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-ipv4
-- as: e2e-metal-ipi-dualstack
+- as: e2e-metal-ipi-ovn-dualstack
   cluster: build05
   optional: true
   steps:

diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.12.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.12.yaml
@@ -51,25 +51,25 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   steps:
     cluster_profile: aws
     workflow: openshift-upgrade-aws
-- as: e2e-gcp-serial
+- as: e2e-gcp-ovn-serial
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-serial
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-ipv4
-- as: e2e-metal-ipi-dualstack
+- as: e2e-metal-ipi-ovn-dualstack
   cluster: build05
   optional: true
   steps:

diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.13.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.13.yaml
@@ -52,25 +52,25 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   steps:
     cluster_profile: aws
     workflow: openshift-upgrade-aws
-- as: e2e-gcp-serial
+- as: e2e-gcp-ovn-serial
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-serial
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-ipv4
-- as: e2e-metal-ipi-dualstack
+- as: e2e-metal-ipi-ovn-dualstack
   cluster: build05
   optional: true
   steps:

diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.14.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.14.yaml
@@ -51,25 +51,25 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+- as: e2e-aws-ovn-upgrade
   steps:
     cluster_profile: aws
     workflow: openshift-upgrade-aws
-- as: e2e-gcp-serial
+- as: e2e-gcp-ovn-serial
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-serial
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-ipv4
-- as: e2e-metal-ipi-dualstack
+- as: e2e-metal-ipi-ovn-dualstack
   cluster: build05
   optional: true
   steps:

diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-master-presubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-master-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     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-coredns-master-e2e-aws
+    name: pull-ci-openshift-coredns-master-e2e-aws-ovn
     path_alias: github.com/coredns/coredns
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -24,8 +24,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-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,23 +72,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws-upgrade
+    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-coredns-master-e2e-aws-upgrade
+    name: pull-ci-openshift-coredns-master-e2e-aws-ovn-upgrade
     path_alias: github.com/coredns/coredns
-    rerun_command: /test e2e-aws-upgrade
+    rerun_command: /test e2e-aws-ovn-upgrade
     spec:
       containers:
       - args:
@@ -97,8 +97,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-ovn-upgrade-cluster-profile
+        - --target=e2e-aws-ovn-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,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-ovn-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,23 +145,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-serial
+    context: ci/prow/e2e-gcp-ovn-serial
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-coredns-master-e2e-gcp-serial
+    name: pull-ci-openshift-coredns-master-e2e-gcp-ovn-serial
     path_alias: github.com/coredns/coredns
-    rerun_command: /test e2e-gcp-serial
+    rerun_command: /test e2e-gcp-ovn-serial
     spec:
       containers:
       - args:
@@ -170,8 +170,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-gcp-serial-cluster-profile
-        - --target=e2e-gcp-serial
+        - --secret-dir=/usr/local/e2e-gcp-ovn-serial-cluster-profile
+        - --target=e2e-gcp-ovn-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-serial-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -222,25 +222,25 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-coredns-master-e2e-metal-ipi
+    name: pull-ci-openshift-coredns-master-e2e-metal-ipi-ovn-dualstack
     optional: true
     path_alias: github.com/coredns/coredns
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
       - args:
@@ -249,8 +249,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-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -266,7 +266,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -297,25 +297,25 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-metal-ipi-dualstack
+    context: ci/prow/e2e-metal-ipi-sdn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-coredns-master-e2e-metal-ipi-dualstack
+    name: pull-ci-openshift-coredns-master-e2e-metal-ipi-sdn
     optional: true
     path_alias: github.com/coredns/coredns
-    rerun_command: /test e2e-metal-ipi-dualstack
+    rerun_command: /test e2e-metal-ipi-sdn
     spec:
       containers:
       - args:
@@ -324,8 +324,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-metal-ipi-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-cluster-profile
+        - --target=e2e-metal-ipi-sdn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -341,7 +341,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -372,7 +372,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: