From 38fd2bd05ecc4a802db9dbd0872bdbddaf268dac Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Thu, 21 Jan 2021 20:23:51 +0100 Subject: [PATCH] MCO: add optional e2e-vsphere for OKD Some MCO changes may affect OKD, so this PR adds optional test for it --- ...t-machine-config-operator-master__okd.yaml | 4 ++ ...hine-config-operator-release-4.6__okd.yaml | 4 ++ ...hine-config-operator-release-4.7__okd.yaml | 4 ++ ...ine-config-operator-master-presubmits.yaml | 70 +++++++++++++++++++ ...onfig-operator-release-4.6-presubmits.yaml | 70 +++++++++++++++++++ ...onfig-operator-release-4.7-presubmits.yaml | 70 +++++++++++++++++++ 6 files changed, 222 insertions(+) diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml index 01f3f1f3b79bb..a51200a55d531 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml @@ -60,6 +60,10 @@ tests: steps: cluster_profile: gcp workflow: openshift-upgrade-gcp +- as: e2e-vsphere + steps: + cluster_profile: vsphere + workflow: openshift-e2e-vsphere zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml index 3b2bc9901be9b..adaa382882407 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml @@ -68,6 +68,10 @@ tests: steps: cluster_profile: gcp workflow: openshift-upgrade-gcp +- as: e2e-vsphere + steps: + cluster_profile: vsphere + workflow: openshift-e2e-vsphere zz_generated_metadata: branch: release-4.6 org: openshift diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7__okd.yaml index c07429fc3150d..5ccf29603347a 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7__okd.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7__okd.yaml @@ -73,6 +73,10 @@ tests: steps: cluster_profile: gcp workflow: openshift-upgrade-gcp +- as: e2e-vsphere + steps: + cluster_profile: vsphere + workflow: openshift-e2e-vsphere zz_generated_metadata: branch: release-4.7 org: openshift 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 b59ddc4222d3c..461a57b5ba268 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 @@ -1458,6 +1458,76 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-e2e-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - master + cluster: vsphere + context: ci/prow/okd-e2e-vsphere + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-master-okd-e2e-vsphere + optional: true + rerun_command: /test okd-e2e-vsphere + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-vsphere-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: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-vsphere + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml index 8a8f86c38e8f2..7d95e718e1450 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml @@ -1251,6 +1251,76 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-e2e-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - release-4.6 + cluster: vsphere + context: ci/prow/okd-e2e-vsphere + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-4.6-okd-e2e-vsphere + optional: true + rerun_command: /test okd-e2e-vsphere + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-vsphere-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: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-vsphere + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml index bd310c9b053ae..9d4c267f67cf8 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml @@ -1455,6 +1455,76 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-e2e-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - release-4.7 + cluster: vsphere + context: ci/prow/okd-e2e-vsphere + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-4.7-okd-e2e-vsphere + optional: true + rerun_command: /test okd-e2e-vsphere + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-vsphere-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: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-vsphere + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: