diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml index 890991079972d..01ebb90062d5f 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml @@ -522,6 +522,20 @@ tests: - chain: openshift-qe-orion-consolidated workflow: openshift-qe-installer-aws timeout: 3h30m0s +- always_run: false + as: e2e-external-aws-ccm + optional: true + steps: + cluster_profile: aws + env: + PLATFORM_EXTERNAL_CCM_ENABLED: "yes" + TEST_ARGS: "" + TEST_SKIPS: "" + observers: + enable: + - observers-resource-watch + workflow: openshift-e2e-external-aws + timeout: 6h0m0s zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml index 3e8029a2e5ba5..89c0971c57f26 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml @@ -1450,6 +1450,82 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build03 + context: ci/prow/e2e-external-aws-ccm + decorate: true + decoration_config: + timeout: 6h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kubernetes-master-e2e-external-aws-ccm + optional: true + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-external-aws-ccm + 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-external-aws-ccm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + 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-external-aws-ccm,?($|\s.*) - agent: kubernetes always_run: true branches: