From bc6dd631ed214a02a63d6290cb2a034b06e63aeb Mon Sep 17 00:00:00 2001 From: Andrey Lebedev Date: Thu, 26 Jan 2023 22:25:05 +0100 Subject: [PATCH] coredns: rename jobs to add cni --- .../coredns/openshift-coredns-master.yaml | 10 +-- .../openshift-coredns-release-4.12.yaml | 10 +-- .../openshift-coredns-release-4.13.yaml | 10 +-- .../openshift-coredns-release-4.14.yaml | 10 +-- .../openshift-coredns-master-presubmits.yaml | 72 +++++++++---------- ...shift-coredns-release-4.12-presubmits.yaml | 72 +++++++++---------- ...shift-coredns-release-4.13-presubmits.yaml | 72 +++++++++---------- ...shift-coredns-release-4.14-presubmits.yaml | 72 +++++++++---------- 8 files changed, 164 insertions(+), 164 deletions(-) diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml index 9cfd94c301491..cdc1d19bc1cec 100644 --- 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 index 7d91854729f63..bc3526d14a727 100644 --- 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 index 81c682c1aad06..02ddf8e342bf4 100644 --- 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 index b424eab0a9cb9..a8568828958da 100644 --- 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 index fb89d3fda8c26..74ffce40a5db5 100644 --- 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,14 +222,14 @@ 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 @@ -237,10 +237,10 @@ presubmits: 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,14 +297,14 @@ 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 @@ -312,10 +312,10 @@ presubmits: 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: diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.12-presubmits.yaml index 8b06aafdb5443..69a0b58d65827 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.12-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^release-4\.12$ - ^release-4\.12- 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-release-4.12-e2e-aws + name: pull-ci-openshift-coredns-release-4.12-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: - ^release-4\.12$ - ^release-4\.12- 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-release-4.12-e2e-aws-upgrade + name: pull-ci-openshift-coredns-release-4.12-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: - ^release-4\.12$ - ^release-4\.12- 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-release-4.12-e2e-gcp-serial + name: pull-ci-openshift-coredns-release-4.12-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,14 +222,14 @@ 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: - ^release-4\.12$ - ^release-4\.12- 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 @@ -237,10 +237,10 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-coredns-release-4.12-e2e-metal-ipi + name: pull-ci-openshift-coredns-release-4.12-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,14 +297,14 @@ 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: - ^release-4\.12$ - ^release-4\.12- 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 @@ -312,10 +312,10 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-coredns-release-4.12-e2e-metal-ipi-dualstack + name: pull-ci-openshift-coredns-release-4.12-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: diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.13-presubmits.yaml index 6790e11b0e96b..cb20c0f73ef14 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.13-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^release-4\.13$ - ^release-4\.13- 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-release-4.13-e2e-aws + name: pull-ci-openshift-coredns-release-4.13-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: - ^release-4\.13$ - ^release-4\.13- 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-release-4.13-e2e-aws-upgrade + name: pull-ci-openshift-coredns-release-4.13-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: - ^release-4\.13$ - ^release-4\.13- 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-release-4.13-e2e-gcp-serial + name: pull-ci-openshift-coredns-release-4.13-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,14 +222,14 @@ 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: - ^release-4\.13$ - ^release-4\.13- 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 @@ -237,10 +237,10 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-coredns-release-4.13-e2e-metal-ipi + name: pull-ci-openshift-coredns-release-4.13-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,14 +297,14 @@ 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: - ^release-4\.13$ - ^release-4\.13- 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 @@ -312,10 +312,10 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-coredns-release-4.13-e2e-metal-ipi-dualstack + name: pull-ci-openshift-coredns-release-4.13-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: diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.14-presubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.14-presubmits.yaml index c7c7f1fa000e9..152ae3905fb30 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.14-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^release-4\.14$ - ^release-4\.14- 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-release-4.14-e2e-aws + name: pull-ci-openshift-coredns-release-4.14-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: - ^release-4\.14$ - ^release-4\.14- 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-release-4.14-e2e-aws-upgrade + name: pull-ci-openshift-coredns-release-4.14-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: - ^release-4\.14$ - ^release-4\.14- 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-release-4.14-e2e-gcp-serial + name: pull-ci-openshift-coredns-release-4.14-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,14 +222,14 @@ 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: - ^release-4\.14$ - ^release-4\.14- 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 @@ -237,10 +237,10 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-coredns-release-4.14-e2e-metal-ipi + name: pull-ci-openshift-coredns-release-4.14-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,14 +297,14 @@ 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: - ^release-4\.14$ - ^release-4\.14- 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 @@ -312,10 +312,10 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-coredns-release-4.14-e2e-metal-ipi-dualstack + name: pull-ci-openshift-coredns-release-4.14-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: