diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml index 58c1fe547ae34..ddf1ea209d428 100644 --- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml +++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml @@ -11,6 +11,14 @@ base_images: name: tests-private namespace: ci tag: "4.16" + upi-installer: + name: "4.22" + namespace: ocp + tag: upi-installer + vsphere-ci-python: + name: vsphere-python + namespace: ci + tag: latest binary_build_commands: make build-no-gen build_root: from_repository: true @@ -166,6 +174,16 @@ tests: env: TEST_SUITE: cco/conformance/parallel workflow: openshift-e2e-aws-ovn +- always_run: false + as: e2e-vsphere-upi-platform-none + optional: true + steps: + cluster_profile: vsphere-elastic + env: + SLEEP_DURATION: 24h + test: + - ref: cucushift-installer-wait + workflow: opct-test-platform-none-vsphere zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml index 3276c1768fff9..597dd6085fc38 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml @@ -4338,17 +4338,21 @@ tests: test: - chain: openshift-e2e-test-qe-destructive workflow: cucushift-installer-rehearse-vsphere-upi-platform-external -- as: vsphere-upi-platform-none-f28 +- as: vsphere-upi-platform-none-f28-test1 cron: 24 3 15 * * steps: cluster_profile: vsphere-elastic + env: + SLEEP_DURATION: 24h test: - - chain: openshift-e2e-test-qe-automated-release + - ref: cucushift-installer-wait workflow: cucushift-installer-rehearse-vsphere-upi-platform-external - as: vsphere-upi-platform-none-f28-destructive cron: 22 9 16 * * steps: cluster_profile: vsphere-elastic + env: + TEST_SCENARIOS: Cluster_Operator test: - chain: openshift-e2e-test-qe-destructive workflow: cucushift-installer-rehearse-vsphere-upi-platform-external diff --git a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master-presubmits.yaml index 5467c67106a96..715b730ec8549 100644 --- a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master-presubmits.yaml @@ -1042,6 +1042,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: vsphere02 + context: ci/prow/e2e-vsphere-upi-platform-none + decorate: true + labels: + ci-operator.openshift.io/cloud: vsphere + ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cloud-credential-operator-master-e2e-vsphere-upi-platform-none + optional: true + rerun_command: /test e2e-vsphere-upi-platform-none + 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 + - --target=e2e-vsphere-upi-platform-none + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-vsphere-upi-platform-none,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml index 45e02a2c77635..d1951cc84e38d 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml @@ -51586,7 +51586,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: vsphere02 - cron: 24 3 15 * * + cron: 22 9 16 * * decorate: true decoration_config: skip_cloning: true @@ -51601,7 +51601,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-openshift-tests-private-release-4.22-amd64-nightly-vsphere-upi-platform-none-f28 + name: periodic-ci-openshift-openshift-tests-private-release-4.22-amd64-nightly-vsphere-upi-platform-none-f28-destructive spec: containers: - args: @@ -51611,7 +51611,7 @@ periodics: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=vsphere-upi-platform-none-f28 + - --target=vsphere-upi-platform-none-f28-destructive - --variant=amd64-nightly command: - ci-operator @@ -51676,7 +51676,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: vsphere02 - cron: 22 9 16 * * + cron: 24 3 15 * * decorate: true decoration_config: skip_cloning: true @@ -51691,7 +51691,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-openshift-tests-private-release-4.22-amd64-nightly-vsphere-upi-platform-none-f28-destructive + name: periodic-ci-openshift-openshift-tests-private-release-4.22-amd64-nightly-vsphere-upi-platform-none-f28-test1 spec: containers: - args: @@ -51701,7 +51701,7 @@ periodics: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=vsphere-upi-platform-none-f28-destructive + - --target=vsphere-upi-platform-none-f28-test1 - --variant=amd64-nightly command: - ci-operator