Merge pull request #3088 from spadgett/olm-suite

Add separate e2e-aws-console-olm suite

Author: openshift-merge-robot

ci-operator/config/openshift/console/OWNERS

@@ -0,0 +1,11 @@
+reviewers:
+  - jcaianirh
+  - petr-muller
+  - spadgett
+  - stevekuznetsov
+approvers:
+  - bparees
+  - jcaianirh
+  - petr-muller
+  - spadgett
+  - stevekuznetsov

ci-operator/config/openshift/console/openshift-console-master.yaml

@@ -49,10 +49,15 @@ tests:
   container:
     from: test-bin
 - artifact_dir: /tmp/artifacts
-  as: console-e2e
+  as: e2e-aws-console
   commands: ./test-prow-e2e.sh
   openshift_installer_src:
     cluster_profile: aws
+- artifact_dir: /tmp/artifacts
+  as: e2e-aws-console-olm
+  commands: ./test-prow-e2e.sh olmFull
+  openshift_installer_src:
+    cluster_profile: aws
 - as: e2e-aws
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer:

ci-operator/jobs/openshift/console/OWNERS

@@ -0,0 +1,11 @@
+reviewers:
+  - jcaianirh
+  - petr-muller
+  - spadgett
+  - stevekuznetsov
+approvers:
+  - bparees
+  - jcaianirh
+  - petr-muller
+  - spadgett
+  - stevekuznetsov

ci-operator/jobs/openshift/console/openshift-console-master-presubmits.yaml

@@ -36,20 +36,75 @@ presubmits:
     always_run: true
     branches:
     - master
-    context: ci/prow/console-e2e
+    context: ci/prow/e2e-aws
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    name: pull-ci-openshift-console-master-e2e-aws
+    rerun_command: /test e2e-aws
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --secret-dir=/usr/local/e2e-aws-cluster-profile
+        - --target=e2e-aws
+        - --template=/usr/local/e2e-aws
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: aws
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-console-master.yaml
+              name: ci-operator-master-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /usr/local/e2e-aws-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/e2e-aws
+          name: job-definition
+          subPath: cluster-launch-installer-e2e.yaml
+      serviceAccountName: ci-operator
+      volumes:
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - configMap:
+          name: prow-job-cluster-launch-installer-e2e
+        name: job-definition
+    trigger: '(?m)^/test (?:.*? )?e2e-aws(?: .*?)?$'
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/e2e-aws-console
     decorate: true
     decoration_config:
       skip_cloning: true
-    name: pull-ci-openshift-console-master-console-e2e
-    rerun_command: /test console-e2e
+    name: pull-ci-openshift-console-master-e2e-aws-console
+    rerun_command: /test e2e-aws-console
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/console-e2e-cluster-profile
-        - --target=console-e2e
-        - --template=/usr/local/console-e2e
+        - --secret-dir=/usr/local/e2e-aws-console-cluster-profile
+        - --target=e2e-aws-console
+        - --template=/usr/local/e2e-aws-console
         command:
         - ci-operator
         env:
@@ -61,7 +116,7 @@ presubmits:
               key: openshift-console-master.yaml
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
-          value: console-e2e
+          value: e2e-aws-console
         - name: TEST_COMMAND
           value: ./test-prow-e2e.sh
         image: ci-operator:latest
@@ -71,9 +126,9 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/console-e2e-cluster-profile
+        - mountPath: /usr/local/e2e-aws-console-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/console-e2e
+        - mountPath: /usr/local/e2e-aws-console
           name: job-definition
           subPath: cluster-launch-installer-src.yaml
       serviceAccountName: ci-operator
@@ -86,25 +141,26 @@ presubmits:
       - configMap:
           name: prow-job-cluster-launch-installer-src
         name: job-definition
-    trigger: '(?m)^/test (?:.*? )?console-e2e(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-console(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches:
     - master
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-console-olm
     decorate: true
     decoration_config:
       skip_cloning: true
-    name: pull-ci-openshift-console-master-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-console-master-e2e-aws-console-olm
+    optional: true
+    rerun_command: /test e2e-aws-console-olm
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
-        - --template=/usr/local/e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-console-olm-cluster-profile
+        - --target=e2e-aws-console-olm
+        - --template=/usr/local/e2e-aws-console-olm
         command:
         - ci-operator
         env:
@@ -116,21 +172,21 @@ presubmits:
               key: openshift-console-master.yaml
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
-          value: e2e-aws
+          value: e2e-aws-console-olm
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance/parallel run-tests
+          value: ./test-prow-e2e.sh olmFull
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
         resources:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-console-olm-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-aws
+        - mountPath: /usr/local/e2e-aws-console-olm
           name: job-definition
-          subPath: cluster-launch-installer-e2e.yaml
+          subPath: cluster-launch-installer-src.yaml
       serviceAccountName: ci-operator
       volumes:
       - name: cluster-profile
@@ -139,9 +195,9 @@ presubmits:
           - secret:
               name: cluster-secrets-aws
       - configMap:
-          name: prow-job-cluster-launch-installer-e2e
+          name: prow-job-cluster-launch-installer-src
         name: job-definition
-    trigger: '(?m)^/test (?:.*? )?e2e-aws(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-console-olm(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches:

hack/validate-owners.sh

@@ -6,8 +6,6 @@
 set -euo pipefail
 
 WHITELIST=$(sort <<'EOF'
-ci-operator/config/openshift/console
-ci-operator/jobs/openshift/console
 ci-operator/config/openshift/kubernetes-metrics-server
 ci-operator/jobs/openshift/kubernetes-metrics-server
 ci-operator/config/openshift/origin-metrics