From 6105b1d56aaba4298964b386eb48c6ef4ee2b3dd Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 31 Aug 2020 13:43:56 -0700
Subject: [PATCH] ci-operator/config/openshift/telemeter: Generic e2e for 4.6+

Following the pattern from e7bb102bc1
(ci-operator/config/openshift/cluster-version-operator: Generic
e2e-gcp -> e2e for 4.4+, 2020-07-09, #10152), this commit is using
platform-agnostic names.  The role of platform-agnostic tests is
discussed in ci-operator/platform-balance.  The choice of a GCP
implementation for the now-agnostic tests is because we currently have
free GCP capacity, while AWS is maxed out.

I've left the benchmark test on AWS, because I'm not sure what that's
about.  It might be AWS-specific.

Generated by manually changing `ci-operator/config/...`, running:

  $ make update
---
 .../telemeter/openshift-telemeter-master.yaml | 10 +++---
 .../openshift-telemeter-release-4.6.yaml      | 10 +++---
 .../openshift-telemeter-release-4.7.yaml      | 10 +++---
 ...openshift-telemeter-master-presubmits.yaml | 36 ++++++++++---------
 ...hift-telemeter-release-4.6-presubmits.yaml | 36 ++++++++++---------
 ...hift-telemeter-release-4.7-presubmits.yaml | 36 ++++++++++---------
 6 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml
index 677c72fa63308..d386c8b42311b 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml
@@ -36,14 +36,14 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e
   steps:
-    cluster_profile: aws
-    workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- as: e2e-upgrade
   commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
-    cluster_profile: aws
+    cluster_profile: gcp
     upgrade: true
 - as: benchmark
   commands: make test-benchmark
diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.6.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.6.yaml
index a48c388dafa46..be8c806ff86a8 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.6.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.6.yaml
@@ -37,14 +37,14 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e
   steps:
-    cluster_profile: aws
-    workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- as: e2e-upgrade
   commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
-    cluster_profile: aws
+    cluster_profile: gcp
     upgrade: true
 - as: benchmark
   commands: make test-benchmark
diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.7.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.7.yaml
index 30f4db0b23de1..2aabc8803bf7b 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.7.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.7.yaml
@@ -36,14 +36,14 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e
   steps:
-    cluster_profile: aws
-    workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- as: e2e-upgrade
   commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
-    cluster_profile: aws
+    cluster_profile: gcp
     upgrade: true
 - as: benchmark
   commands: make test-benchmark
diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-master-presubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-master-presubmits.yaml
index d7c1f8c2be8ec..da45f13502acd 100644
--- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-master-presubmits.yaml
@@ -82,15 +82,15 @@ presubmits:
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e
     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-telemeter-master-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-telemeter-master-e2e
+    rerun_command: /test e2e
     spec:
       containers:
       - args:
@@ -98,8 +98,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-cluster-profile
+        - --target=e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -132,28 +132,30 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-upgrade
     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-telemeter-master-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-telemeter-master-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -161,8 +163,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -175,7 +177,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -195,14 +197,16 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.6-presubmits.yaml
index 0c4ca3b7ceb64..7ce35e2d521ab 100644
--- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.6-presubmits.yaml
@@ -82,15 +82,15 @@ presubmits:
     branches:
     - release-4.6
     cluster: api.ci
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e
     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-telemeter-release-4.6-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-telemeter-release-4.6-e2e
+    rerun_command: /test e2e
     spec:
       containers:
       - args:
@@ -98,8 +98,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-cluster-profile
+        - --target=e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -132,28 +132,30 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.6
     cluster: api.ci
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-upgrade
     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-telemeter-release-4.6-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-telemeter-release-4.6-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -161,8 +163,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -175,7 +177,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -195,14 +197,16 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.7-presubmits.yaml
index e85e9c5dd5bac..2b60164c308f4 100644
--- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.7-presubmits.yaml
+++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.7-presubmits.yaml
@@ -82,15 +82,15 @@ presubmits:
     branches:
     - release-4.7
     cluster: api.ci
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e
     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-telemeter-release-4.7-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-telemeter-release-4.7-e2e
+    rerun_command: /test e2e
     spec:
       containers:
       - args:
@@ -98,8 +98,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-cluster-profile
+        - --target=e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -132,28 +132,30 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.7
     cluster: api.ci
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-upgrade
     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-telemeter-release-4.7-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-telemeter-release-4.7-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -161,8 +163,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -175,7 +177,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -195,14 +197,16 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: