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 73508ef182307..e2f7335e680e7 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,7 +38,3 @@ tests: commands: make unit container: from: src -- as: e2e-operator - steps: - cluster_profile: aws - workflow: origin-e2e-aws-ovn-hybrid 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 a71a11440e0b8..dbf159b1995cd 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,7 +39,3 @@ tests: commands: make unit container: from: src -- as: e2e-operator - steps: - cluster_profile: aws - workflow: origin-e2e-aws-ovn-hybrid 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 43aeb8d77052c..39d0fd0215987 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,7 +38,3 @@ tests: commands: make unit container: from: src -- as: e2e-operator - steps: - cluster_profile: aws - workflow: origin-e2e-aws-ovn-hybrid 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 70f6e33a20214..4c100100fc4f7 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 @@ -66,7 +66,6 @@ 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 @@ -80,11 +79,24 @@ 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 - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - --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: "" @@ -100,6 +112,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 @@ -125,6 +140,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 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 6a8063a533584..d2d2a3d070dcb 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 @@ -56,82 +56,6 @@ presubmits: secret: secretName: sentry-dsn 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 - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --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 - - mountPath: /etc/sentry-dsn - name: sentry-dsn - 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 - - name: sentry-dsn - secret: - secretName: sentry-dsn - 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 32102cebfa078..a01deaaad4807 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 @@ -56,82 +56,6 @@ presubmits: secret: secretName: sentry-dsn 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 - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --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 - - mountPath: /etc/sentry-dsn - name: sentry-dsn - 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 - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*) - agent: kubernetes always_run: true branches: