From 6f55ec4a91605ec3c1fa42a052dc1270c69af28a Mon Sep 17 00:00:00 2001
From: gabemontero <gmontero@redhat.com>
Date: Mon, 22 Jun 2020 14:48:40 -0400
Subject: [PATCH] enable cvo operator-esque make test-e2e e2e-aws-operator job
 for jenkins-client-plugin

---
 ...penshift-jenkins-client-plugin-master.yaml |  6 +-
 ...nkins-client-plugin-master-presubmits.yaml | 77 +++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml
index 56bf5fce1a46e..ac1bec1ccc6da 100644
--- a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml
+++ b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml
@@ -7,7 +7,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.10
+    tag: golang-1.13
 images:
 - dockerfile_path: Dockerfile
   from: original_jenkins
@@ -35,6 +35,10 @@ tests:
   commands: TEST_SUITE=openshift/jenkins-e2e run-tests
   openshift_installer:
     cluster_profile: aws
+- as: e2e-aws-operator
+  commands: make test-e2e
+  openshift_installer_src:
+    cluster_profile: aws
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master-presubmits.yaml b/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master-presubmits.yaml
index 639cff56356e6..84ad24339714c 100644
--- a/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master-presubmits.yaml
@@ -77,6 +77,83 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/e2e-aws-operator
+    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-jenkins-client-plugin-master-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
+    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-operator-cluster-profile
+        - --target=e2e-aws-operator
+        - --template=/usr/local/e2e-aws-operator
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: aws
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-operator
+        - name: TEST_COMMAND
+          value: make test-e2e
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator
+          name: job-definition
+          subPath: cluster-launch-installer-src.yaml
+        - 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
+      - configMap:
+          name: prow-job-cluster-launch-installer-src
+        name: job-definition
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: