diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml index e2f7335e680e7..2ba4a38e1b3b1 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml @@ -38,3 +38,9 @@ tests: commands: make unit container: from: src +- as: e2e-operator + steps: + cluster_profile: aws + workflow: ipi-aws-ovn-hybrid + test: + - ref: windows-e2e-operator-test diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5.yaml index dbf159b1995cd..b5ff484a4d652 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5.yaml @@ -39,3 +39,9 @@ tests: commands: make unit container: from: src +- as: e2e-operator + steps: + cluster_profile: aws + workflow: ipi-aws-ovn-hybrid + test: + - ref: windows-e2e-operator-test diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6.yaml index 39d0fd0215987..01d2bbfb8e080 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6.yaml @@ -38,3 +38,9 @@ tests: commands: make unit container: from: src +- as: e2e-operator + steps: + cluster_profile: aws + workflow: ipi-aws-ovn-hybrid + test: + - ref: windows-e2e-operator-test diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml index 13a30b1302177..cad54c30a18f5 100644 --- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml @@ -59,6 +59,7 @@ presubmits: 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-windows-machine-config-operator-master-e2e-operator rerun_command: /test e2e-operator @@ -72,23 +73,10 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --lease-server-username=ci - --lease-server=https://boskos-ci.svc.ci.openshift.org - - --repo=windows-machine-config-operator - --secret-dir=/usr/local/e2e-operator-cluster-profile - --target=e2e-operator - - --template=/usr/local/e2e-operator command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: CLUSTER_VARIANT - value: ovn - - name: JOB_NAME_SAFE - value: e2e-operator - - name: TEST_COMMAND - value: make run-ci-e2e-test - - name: TEST_IMAGESTREAM_TAG - value: pipeline:windows-machine-config-operator-test image: ci-operator:latest imagePullPolicy: Always name: "" @@ -104,15 +92,9 @@ presubmits: readOnly: true - mountPath: /usr/local/e2e-operator-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-operator - name: job-definition - subPath: cluster-launch-installer-custom-test-image.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true serviceAccountName: ci-operator volumes: - name: apici-ci-operator-credentials @@ -132,15 +114,9 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-custom-test-image - name: job-definition - name: pull-secret secret: secretName: regcred - - name: sentry-dsn - secret: - secretName: sentry-dsn trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*) - agent: kubernetes always_run: true diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5-presubmits.yaml index 6ba64330e5357..a25f715fb166a 100644 --- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5-presubmits.yaml +++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.5-presubmits.yaml @@ -49,6 +49,75 @@ presubmits: secret: secretName: regcred trigger: (?m)^/test( | .* )build,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.5 + cluster: api.ci + context: ci/prow/e2e-operator + 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-windows-machine-config-operator-release-4.5-e2e-operator + rerun_command: /test e2e-operator + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-operator-cluster-profile + - --target=e2e-operator + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-operator-cluster-profile + name: cluster-profile + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - 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 + trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6-presubmits.yaml index 50717a55dfc3d..4e14d24c2c07e 100644 --- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.6-presubmits.yaml @@ -49,6 +49,75 @@ presubmits: secret: secretName: regcred trigger: (?m)^/test( | .* )build,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.6 + cluster: api.ci + context: ci/prow/e2e-operator + 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-windows-machine-config-operator-release-4.6-e2e-operator + rerun_command: /test e2e-operator + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-operator-cluster-profile + - --target=e2e-operator + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-operator-cluster-profile + name: cluster-profile + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - 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 + trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/ipi/aws/ovn/OWNERS b/ci-operator/step-registry/ipi/aws/ovn/OWNERS new file mode 100644 index 0000000000000..fd24801394407 --- /dev/null +++ b/ci-operator/step-registry/ipi/aws/ovn/OWNERS @@ -0,0 +1,6 @@ +approvers: +- aravindhp +- ravisantoshgudimetla +reviewers: +- aravindhp +- ravisantoshgudimetla diff --git a/ci-operator/step-registry/ipi/aws/ovn/hybrid/OWNERS b/ci-operator/step-registry/ipi/aws/ovn/hybrid/OWNERS new file mode 100644 index 0000000000000..fd24801394407 --- /dev/null +++ b/ci-operator/step-registry/ipi/aws/ovn/hybrid/OWNERS @@ -0,0 +1,6 @@ +approvers: +- aravindhp +- ravisantoshgudimetla +reviewers: +- aravindhp +- ravisantoshgudimetla diff --git a/ci-operator/step-registry/ipi/aws/ovn/hybrid/ipi-aws-ovn-hybrid-workflow.yaml b/ci-operator/step-registry/ipi/aws/ovn/hybrid/ipi-aws-ovn-hybrid-workflow.yaml new file mode 100644 index 0000000000000..a1c71c85a087c --- /dev/null +++ b/ci-operator/step-registry/ipi/aws/ovn/hybrid/ipi-aws-ovn-hybrid-workflow.yaml @@ -0,0 +1,12 @@ +workflow: + as: ipi-aws-ovn-hybrid + steps: + pre: + - chain: ipi-conf-aws + - ref: ovn-conf + - ref: ovn-conf-hybrid-manifest + - chain: ipi-install + post: + - chain: ipi-deprovision + documentation: |- + OpenShift cluster configured with Hybrid OVN network diff --git a/ci-operator/step-registry/windows/OWNERS b/ci-operator/step-registry/windows/OWNERS new file mode 100644 index 0000000000000..fd24801394407 --- /dev/null +++ b/ci-operator/step-registry/windows/OWNERS @@ -0,0 +1,6 @@ +approvers: +- aravindhp +- ravisantoshgudimetla +reviewers: +- aravindhp +- ravisantoshgudimetla diff --git a/ci-operator/step-registry/windows/e2e/OWNERS b/ci-operator/step-registry/windows/e2e/OWNERS new file mode 100644 index 0000000000000..fd24801394407 --- /dev/null +++ b/ci-operator/step-registry/windows/e2e/OWNERS @@ -0,0 +1,6 @@ +approvers: +- aravindhp +- ravisantoshgudimetla +reviewers: +- aravindhp +- ravisantoshgudimetla diff --git a/ci-operator/step-registry/windows/e2e/operator/OWNERS b/ci-operator/step-registry/windows/e2e/operator/OWNERS new file mode 100644 index 0000000000000..fd24801394407 --- /dev/null +++ b/ci-operator/step-registry/windows/e2e/operator/OWNERS @@ -0,0 +1,6 @@ +approvers: +- aravindhp +- ravisantoshgudimetla +reviewers: +- aravindhp +- ravisantoshgudimetla diff --git a/ci-operator/step-registry/windows/e2e/operator/test/OWNERS b/ci-operator/step-registry/windows/e2e/operator/test/OWNERS new file mode 100644 index 0000000000000..fd24801394407 --- /dev/null +++ b/ci-operator/step-registry/windows/e2e/operator/test/OWNERS @@ -0,0 +1,6 @@ +approvers: +- aravindhp +- ravisantoshgudimetla +reviewers: +- aravindhp +- ravisantoshgudimetla diff --git a/ci-operator/step-registry/windows/e2e/operator/test/windows-e2e-operator-test-commands.sh b/ci-operator/step-registry/windows/e2e/operator/test/windows-e2e-operator-test-commands.sh new file mode 100644 index 0000000000000..9862d7e2a15d3 --- /dev/null +++ b/ci-operator/step-registry/windows/e2e/operator/test/windows-e2e-operator-test-commands.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile +export AWS_SHARED_CREDENTIALS_FILE=${cluster_profile}/.awscred +export KUBE_SSH_KEY_PATH=${cluster_profile}/ssh-privatekey +make run-ci-e2e-test diff --git a/ci-operator/step-registry/windows/e2e/operator/test/windows-e2e-operator-test-ref.yaml b/ci-operator/step-registry/windows/e2e/operator/test/windows-e2e-operator-test-ref.yaml new file mode 100644 index 0000000000000..a5c8719753016 --- /dev/null +++ b/ci-operator/step-registry/windows/e2e/operator/test/windows-e2e-operator-test-ref.yaml @@ -0,0 +1,10 @@ +ref: + as: windows-e2e-operator-test + from: windows-machine-config-operator-test + commands: windows-e2e-operator-test-commands.sh + resources: + requests: + cpu: 1000m + memory: 600Mi + documentation: |- + The Windows Machine Config Operator's end to end test suite