Merge pull request #4719 from ewolinetz/proxy_phase2_ci

Creating squid AMI in VPC for CI aws proxy testing
openshift · Nov 5, 2019 · f34ec4a · f34ec4a
2 parents 3e1339a + 27c9755
commit f34ec4a
Show file tree

Hide file tree

Showing 2 changed files with 808 additions and 9 deletions.
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -254,6 +254,8 @@ presubmits:
     decorate: true
     decoration_config:
       skip_cloning: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-master-e2e-aws-proxy
     optional: true
     rerun_command: /test e2e-aws-proxy
@@ -293,7 +295,7 @@ presubmits:
           name: cluster-profile
         - mountPath: /usr/local/e2e-aws-proxy
           name: job-definition
-          subPath: cluster-launch-installer-e2e.yaml
+          subPath: cluster-launch-installer-upi-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -305,7 +307,7 @@ presubmits:
           - secret:
               name: cluster-secrets-aws
       - configMap:
-          name: prow-job-cluster-launch-installer-e2e
+          name: prow-job-cluster-launch-installer-upi-e2e
         name: job-definition
       - name: sentry-dsn
         secret: