From 5840e889ef5ffd622afc627ed56ce9671ec842c3 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 2 Dec 2018 19:38:10 -0500 Subject: [PATCH] Fix e2e-aws for router and clean up an accidental typo in some jobs --- .../openshift-cluster-bootstrap-master.yaml | 2 +- .../openshift-cluster-image-registry-operator-master.yaml | 2 +- .../openshift-cluster-kube-apiserver-operator-master.yaml | 2 +- ...ift-cluster-kube-controller-manager-operator-master.yaml | 2 +- .../openshift-cluster-kube-scheduler-operator-master.yaml | 2 +- .../openshift-cluster-machine-approver-master.yaml | 2 +- .../openshift-cluster-monitoring-operator-master.yaml | 2 +- .../openshift-cluster-network-operator-master.yaml | 2 +- ...enshift-cluster-openshift-apiserver-operator-master.yaml | 2 +- ...luster-openshift-controller-manager-operator-master.yaml | 2 +- .../openshift-cluster-samples-operator-master.yaml | 2 +- .../openshift-cluster-version-operator-master.yaml | 2 +- .../console-operator/openshift-console-operator-master.yaml | 2 +- .../openshift/installer/openshift-installer-master.yaml | 4 ++-- .../openshift-machine-api-operator-master.yaml | 2 +- .../openshift-machine-config-operator-master.yaml | 2 +- .../config/openshift/origin/openshift-origin-master.yaml | 2 +- .../openshift-pod-checkpointer-operator-master.yaml | 2 +- .../config/openshift/router/openshift-router-master.yaml | 2 +- .../openshift-service-ca-operator-master.yaml | 2 +- .../openshift-service-serving-cert-signer-master.yaml | 2 +- ...perator-framework-operator-lifecycle-manager-master.yaml | 2 +- .../operator-framework-operator-marketplace-master.yaml | 2 +- .../openshift-cluster-bootstrap-master-presubmits.yaml | 2 +- ...t-cluster-image-registry-operator-master-presubmits.yaml | 2 +- ...t-cluster-kube-apiserver-operator-master-presubmits.yaml | 2 +- ...-kube-controller-manager-operator-master-presubmits.yaml | 2 +- ...t-cluster-kube-scheduler-operator-master-presubmits.yaml | 2 +- ...penshift-cluster-machine-approver-master-presubmits.yaml | 2 +- ...shift-cluster-monitoring-operator-master-presubmits.yaml | 2 +- ...penshift-cluster-network-operator-master-presubmits.yaml | 2 +- ...ster-openshift-apiserver-operator-master-presubmits.yaml | 2 +- ...shift-controller-manager-operator-master-presubmits.yaml | 2 +- ...penshift-cluster-samples-operator-master-presubmits.yaml | 2 +- ...penshift-cluster-version-operator-master-presubmits.yaml | 2 +- .../openshift-console-operator-master-presubmits.yaml | 2 +- .../installer/openshift-installer-master-presubmits.yaml | 6 +++--- .../openshift-machine-api-operator-master-presubmits.yaml | 2 +- ...openshift-machine-config-operator-master-presubmits.yaml | 2 +- .../origin/openshift-origin-master-presubmits.yaml | 2 +- ...enshift-pod-checkpointer-operator-master-presubmits.yaml | 2 +- .../router/openshift-router-master-presubmits.yaml | 6 ++---- .../openshift-service-ca-operator-master-presubmits.yaml | 2 +- ...shift-service-serving-cert-signer-master-presubmits.yaml | 2 +- ...mework-operator-lifecycle-manager-master-presubmits.yaml | 2 +- ...or-framework-operator-marketplace-master-presubmits.yaml | 2 +- 46 files changed, 50 insertions(+), 52 deletions(-) diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml index 527da9125d442..78a1d51278ee8 100644 --- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml +++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml @@ -53,7 +53,7 @@ tests: from: test-bin - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml index fe56a71a6cbae..f3dddd1b39745 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml @@ -24,7 +24,7 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-operator diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml index 9da1c4c6b3be2..4ed4a242341ed 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml @@ -47,7 +47,7 @@ tests: from: test-bin - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml index f243b65765339..424920b3aaf1b 100644 --- a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml @@ -47,7 +47,7 @@ tests: from: test-bin - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml index fe74680f60e07..774ed91a242f8 100644 --- a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml @@ -37,7 +37,7 @@ tests: container: from: test-bin - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-operator diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml index bfee11998bbb5..b3d21a822b5f7 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml @@ -20,7 +20,7 @@ images: to: cluster-machine-approver tests: - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws resources: diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml index 5a81a7b9c8c38..b175a392aea68 100644 --- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml @@ -34,6 +34,6 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml index 77f23576f9ff7..86fe05ef52491 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml @@ -38,6 +38,6 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml index 5d60d6cda0348..9bbae48924fc2 100644 --- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml @@ -47,7 +47,7 @@ tests: from: test-bin - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml index 222e4e0d74050..fa58ce456cab0 100644 --- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml @@ -47,7 +47,7 @@ tests: from: test-bin - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml index d1ef0459e67a7..2ba5608f0bd47 100644 --- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml @@ -24,7 +24,7 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-operator diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml index 66e9b538c86a7..12cf201e4a412 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml @@ -34,6 +34,6 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml index 4b633303906bf..366bb090faf6e 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml @@ -44,6 +44,6 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index 46d253f9b0f68..25eb7de3f70a0 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -66,7 +66,7 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-all @@ -75,6 +75,6 @@ tests: openshift_installer: cluster_profile: aws - as: e2e-openstack - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: openstack diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml index 38fa998cc3cf8..1a473ea42e32c 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml @@ -47,7 +47,7 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-operator 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 3ba9ef1c019a9..b5c33d58bf5fe 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 @@ -47,6 +47,6 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/origin/openshift-origin-master.yaml b/ci-operator/config/openshift/origin/openshift-origin-master.yaml index 2f03cf61c7246..57ccc24241ca1 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-master.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-master.yaml @@ -190,7 +190,7 @@ tests: container: from: bin - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-conformance-k8s diff --git a/ci-operator/config/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master.yaml b/ci-operator/config/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master.yaml index 29e32b157ad4c..b9250410804f8 100644 --- a/ci-operator/config/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master.yaml +++ b/ci-operator/config/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master.yaml @@ -33,7 +33,7 @@ tag_specification: tests: - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/router/openshift-router-master.yaml b/ci-operator/config/openshift/router/openshift-router-master.yaml index 3ecccb3244c52..3d6cf62e242fe 100644 --- a/ci-operator/config/openshift/router/openshift-router-master.yaml +++ b/ci-operator/config/openshift/router/openshift-router-master.yaml @@ -44,7 +44,7 @@ tests: cluster_profile: gcp - as: e2e-aws commands: TEST_SUITE=openshift/smoke-4 run-tests - openshift_ansible: + openshift_installer: cluster_profile: aws resources: '*': diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml index 9949a2e9d2080..e2600b8061de3 100644 --- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml +++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml @@ -38,6 +38,6 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/config/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master.yaml b/ci-operator/config/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master.yaml index fbe9888c375f1..00c573771ed33 100644 --- a/ci-operator/config/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master.yaml +++ b/ci-operator/config/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master.yaml @@ -38,7 +38,7 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-operator diff --git a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml index 51f3a01ee841e..b39eb1a56f69c 100644 --- a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml +++ b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml @@ -44,7 +44,7 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-olm diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml index 7d427d949d6a5..e71123dab3a83 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml @@ -36,6 +36,6 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/smoke-4 run-tests run-tests + commands: TEST_SUITE=openshift/smoke-4 run-tests openshift_installer: cluster_profile: aws diff --git a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml index ba7f4176c74ab..8975d51dbcdca 100644 --- a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml index daf224927d8e1..ca14a8f075b79 100644 --- a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master-presubmits.yaml index 723045b567627..b5dbc64f69d7a 100644 --- a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master-presubmits.yaml index 09e68b02a5bc7..be3784a5cfff3 100644 --- a/ci-operator/jobs/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master-presubmits.yaml index c29c6effd7792..9a0a832e61bd5 100644 --- a/ci-operator/jobs/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master-presubmits.yaml index dc77c1b001452..02f58512de2ed 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master-presubmits.yaml index 6fd24865a568a..6155d8fc0695c 100644 --- a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml index fcae6391b1c14..f3c43298b0769 100644 --- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master-presubmits.yaml index 450c78d3bc82d..553bfb1552686 100644 --- a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master-presubmits.yaml index 08eb771bcb880..66049389ab947 100644 --- a/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master-presubmits.yaml index 0047721052650..ebec3f040cda5 100644 --- a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml index a0d396a00597b..37221ef9f6dd9 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-master-presubmits.yaml index 5d46c09135379..81e31e5ca0788 100644 --- a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index a42bfa0a5bc13..d62e6b2abe250 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -31,7 +31,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -147,7 +147,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-libvirt - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -206,7 +206,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-openstack - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml index 0d43c0d445325..143346b7f1325 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml @@ -38,7 +38,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" 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 b2c23139b7fab..cf4c981025336 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 @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml index bf372b772b6dd..3f4f6e40d99e7 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master-presubmits.yaml index 2be4763caaf17..d48e60d2e84e4 100644 --- a/ci-operator/jobs/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/pod-checkpointer-operator/openshift-pod-checkpointer-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/router/openshift-router-master-presubmits.yaml b/ci-operator/jobs/openshift/router/openshift-router-master-presubmits.yaml index 18b8af5e594f4..c4f8e88fdf31e 100644 --- a/ci-operator/jobs/openshift/router/openshift-router-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/router/openshift-router-master-presubmits.yaml @@ -29,8 +29,6 @@ presubmits: name: ci-operator-configs - name: JOB_NAME_SAFE value: e2e-aws - - name: RPM_REPO_OPENSHIFT_ORIGIN - value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ - name: TEST_COMMAND value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest @@ -46,7 +44,7 @@ presubmits: name: cluster-profile - mountPath: /usr/local/e2e-aws name: job-definition - subPath: cluster-launch-e2e.yaml + subPath: cluster-launch-installer-e2e.yaml serviceAccountName: ci-operator volumes: - name: cluster-profile @@ -55,7 +53,7 @@ presubmits: - secret: name: cluster-secrets-aws - configMap: - name: prow-job-cluster-launch-e2e + name: prow-job-cluster-launch-installer-e2e name: job-definition trigger: ((?m)^/test( all| e2e-aws),?(\s+|$)) - agent: kubernetes diff --git a/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-master-presubmits.yaml index 1e70b854e746a..bb77b037da8ed 100644 --- a/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master-presubmits.yaml b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master-presubmits.yaml index 2f9bd8459c4c7..dd94dfcdda7b5 100644 --- a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master-presubmits.yaml b/ci-operator/jobs/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master-presubmits.yaml index 0841a3362dfed..bd7edc56fd4dd 100644 --- a/ci-operator/jobs/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master-presubmits.yaml +++ b/ci-operator/jobs/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml index 5511601ab798c..15f2f4b54103f 100755 --- a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml +++ b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml @@ -30,7 +30,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + value: TEST_SUITE=openshift/smoke-4 run-tests image: ci-operator:latest imagePullPolicy: Always name: ""