diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml index a10184a009ab4..40442c8d46fd7 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml @@ -198,6 +198,13 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp-libvirt +- as: e2e-nutanix + cluster: build01 + optional: true + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + steps: + cluster_profile: nutanix + workflow: openshift-e2e-nutanix - as: e2e-vsphere optional: true skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ diff --git a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml index 3e1b5105c5ce1..d8e71cce3bfcc 100644 --- a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml +++ b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml @@ -42,6 +42,12 @@ tests: steps: cluster_profile: aws workflow: openshift-e2e-aws +- as: e2e-nutanix + cluster: build01 + optional: true + steps: + cluster_profile: nutanix + workflow: openshift-e2e-nutanix - as: unit commands: make test container: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml index 34e10f9dd5a6d..154b2a69061f8 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml @@ -1045,6 +1045,81 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-virtualmedia,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/e2e-nutanix + decorate: true + labels: + ci-operator.openshift.io/cloud: nutanix + ci-operator.openshift.io/cloud-cluster-profile: nutanix + ci-operator.openshift.io/cluster: build01 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-master-e2e-nutanix + optional: true + rerun_command: /test e2e-nutanix + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + 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-nutanix-cluster-profile + - --target=e2e-nutanix + 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-nutanix-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-nutanix + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-nutanix,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main-presubmits.yaml index 6572db55f6c28..682fcf602e318 100644 --- a/ci-operator/jobs/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main-presubmits.yaml @@ -72,6 +72,80 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/e2e-nutanix + decorate: true + labels: + ci-operator.openshift.io/cloud: nutanix + ci-operator.openshift.io/cloud-cluster-profile: nutanix + ci-operator.openshift.io/cluster: build01 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-provider-nutanix-main-e2e-nutanix + optional: true + rerun_command: /test e2e-nutanix + 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-nutanix-cluster-profile + - --target=e2e-nutanix + 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-nutanix-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-nutanix + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-nutanix,?($|\s.*) - agent: kubernetes always_run: true branches: