diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml index e70fe714d5b2a..91ac0ee9a776d 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml @@ -74,6 +74,14 @@ tests: steps: cluster_profile: aws workflow: openshift-upgrade-aws +- as: e2e-azure-ovn-upgrade + optional: true + steps: + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com + TEST_TYPE: upgrade-conformance + workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial optional: true skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml index 485df98afd5b8..d265bfcdd5cb6 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml @@ -74,6 +74,14 @@ tests: steps: cluster_profile: aws workflow: openshift-upgrade-aws +- as: e2e-azure-ovn-upgrade + optional: true + steps: + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com + TEST_TYPE: upgrade-conformance + workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial optional: true skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml index ebb7334a5241d..a9b5a5acd6293 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml @@ -75,6 +75,14 @@ tests: steps: cluster_profile: aws workflow: openshift-upgrade-aws +- as: e2e-azure-ovn-upgrade + optional: true + steps: + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com + TEST_TYPE: upgrade-conformance + workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial optional: true skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml index 22e2d07b4e123..8f6121ce6f0a6 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml @@ -929,6 +929,79 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build02 + context: ci/prow/e2e-azure-ovn-upgrade + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-master-e2e-azure-ovn-upgrade + optional: true + rerun_command: /test e2e-azure-ovn-upgrade + 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 + - --secret-dir=/usr/local/e2e-azure-ovn-upgrade-cluster-profile + - --target=e2e-azure-ovn-upgrade + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-azure-ovn-upgrade-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + secret: + secretName: cluster-secrets-azure-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-azure-ovn-upgrade,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml index bc36f47e38764..f50496eac93c7 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml @@ -929,6 +929,79 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.10$ + - ^release-4\.10- + cluster: build01 + context: ci/prow/e2e-azure-ovn-upgrade + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-4.10-e2e-azure-ovn-upgrade + optional: true + rerun_command: /test e2e-azure-ovn-upgrade + 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 + - --secret-dir=/usr/local/e2e-azure-ovn-upgrade-cluster-profile + - --target=e2e-azure-ovn-upgrade + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-azure-ovn-upgrade-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + secret: + secretName: cluster-secrets-azure-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-azure-ovn-upgrade,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11-presubmits.yaml index fbfe9c77f7095..4d76b858a557f 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11-presubmits.yaml @@ -929,6 +929,79 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.11$ + - ^release-4\.11- + cluster: build01 + context: ci/prow/e2e-azure-ovn-upgrade + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-4.11-e2e-azure-ovn-upgrade + optional: true + rerun_command: /test e2e-azure-ovn-upgrade + 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 + - --secret-dir=/usr/local/e2e-azure-ovn-upgrade-cluster-profile + - --target=e2e-azure-ovn-upgrade + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-azure-ovn-upgrade-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + secret: + secretName: cluster-secrets-azure-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-azure-ovn-upgrade,?($|\s.*) - agent: kubernetes always_run: false branches: