From f56a3615d55cd985d88e1fd882e0e5dd76803e4c Mon Sep 17 00:00:00 2001
From: Stephen Greene <sgreene@redhat.com>
Date: Thu, 1 Oct 2020 14:21:06 -0400
Subject: [PATCH] Origin: Add optional e2e-aws-proxy job with no test skips

Add's the e2e-aws-proxy jobs as an optional,
manually triggered job to openshift/origin master branch.
This job overrides the TEST_SKIPS env var so that no tests
are skipped.
---
 .../origin/openshift-origin-master.yaml       |  6 ++
 .../openshift-origin-master-presubmits.yaml   | 64 +++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/ci-operator/config/openshift/origin/openshift-origin-master.yaml b/ci-operator/config/openshift/origin/openshift-origin-master.yaml
index e480a74a4dc24..5f72826e0e131 100644
--- a/ci-operator/config/openshift/origin/openshift-origin-master.yaml
+++ b/ci-operator/config/openshift/origin/openshift-origin-master.yaml
@@ -97,6 +97,12 @@ tests:
   commands: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer:
     cluster_profile: aws
+- as: e2e-aws-proxy
+  steps:
+    cluster_profile: aws
+    env:
+      TEST_SKIPS: ""
+    workflow: openshift-e2e-aws-proxy
 - as: e2e-aws-jenkins
   steps:
     cluster_profile: aws
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 fc36a6fd4cbca..9be41671b5238 100644
--- a/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
@@ -589,6 +589,70 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    cluster: build01
+    context: ci/prow/e2e-aws-proxy
+    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-origin-master-e2e-aws-proxy
+    optional: true
+    rerun_command: /test e2e-aws-proxy
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
+        - --target=e2e-aws-proxy
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
+          name: cluster-profile
+        - 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: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: