From b57746f41b7e464021e13f6a59faa74e8d865eee Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 18 Jun 2020 09:57:41 -0500 Subject: [PATCH] machine-config-operator: add e2e-aws-ovn job Ensures changes to MCO (like https://github.com/openshift/machine-config-operator/pull/1636) don't break ovn-kubernetes, Windows, hybrid overlay, etc. --- ...nshift-machine-config-operator-master.yaml | 4 ++ ...t-machine-config-operator-release-4.5.yaml | 4 ++ ...t-machine-config-operator-release-4.6.yaml | 4 ++ ...ine-config-operator-master-presubmits.yaml | 63 +++++++++++++++++++ ...onfig-operator-release-4.5-presubmits.yaml | 63 +++++++++++++++++++ ...onfig-operator-release-4.6-presubmits.yaml | 63 +++++++++++++++++++ 6 files changed, 201 insertions(+) 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 81fcc1b9d9c38..37db8e5e3b8e0 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 @@ -75,6 +75,10 @@ tests: steps: cluster_profile: vsphere workflow: openshift-e2e-vsphere +- as: e2e-ovn-step-registry + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-ovn zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5.yaml index 7543a7dab8692..43b82cddf5b40 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5.yaml @@ -75,6 +75,10 @@ tests: steps: cluster_profile: vsphere workflow: openshift-e2e-vsphere +- as: e2e-ovn-step-registry + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-ovn zz_generated_metadata: branch: release-4.5 org: openshift diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6.yaml index 6586a38a14ce6..d6e7bb7eefe2d 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6.yaml @@ -76,6 +76,10 @@ tests: steps: cluster_profile: vsphere workflow: openshift-e2e-vsphere +- as: e2e-ovn-step-registry + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-ovn zz_generated_metadata: branch: release-4.6 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 9d1bad82b73e4..996bb0c20306d 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 @@ -664,6 +664,69 @@ presubmits: secret: secretName: regcred trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: api.ci + context: ci/prow/e2e-ovn-step-registry + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-master-e2e-ovn-step-registry + rerun_command: /test e2e-ovn-step-registry + spec: + containers: + - args: + - --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-ovn-step-registry-cluster-profile + - --target=e2e-ovn-step-registry + 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-ovn-step-registry-cluster-profile + name: cluster-profile + - 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-aws + - name: pull-secret + secret: + secretName: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-ovn-step-registry,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5-presubmits.yaml index f3a21c9e3c236..0170860767e12 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5-presubmits.yaml @@ -580,6 +580,69 @@ presubmits: secret: secretName: regcred trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.5 + cluster: api.ci + context: ci/prow/e2e-ovn-step-registry + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-4.5-e2e-ovn-step-registry + rerun_command: /test e2e-ovn-step-registry + spec: + containers: + - args: + - --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-ovn-step-registry-cluster-profile + - --target=e2e-ovn-step-registry + 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-ovn-step-registry-cluster-profile + name: cluster-profile + - 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-aws + - name: pull-secret + secret: + secretName: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-ovn-step-registry,?($|\s.*) - agent: kubernetes always_run: false 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 6601a06a077fb..33aa5e4e3f362 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 @@ -663,6 +663,69 @@ presubmits: secret: secretName: regcred trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.6 + cluster: api.ci + context: ci/prow/e2e-ovn-step-registry + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-4.6-e2e-ovn-step-registry + rerun_command: /test e2e-ovn-step-registry + spec: + containers: + - args: + - --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-ovn-step-registry-cluster-profile + - --target=e2e-ovn-step-registry + 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-ovn-step-registry-cluster-profile + name: cluster-profile + - 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-aws + - name: pull-secret + secret: + secretName: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-ovn-step-registry,?($|\s.*) - agent: kubernetes always_run: false branches: