Run OLM and OperatorHub tests as a separate suite in CI

openshift · Mar 13, 2019 · f27b6a8 · f27b6a8
1 parent bd747e2
commit f27b6a8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/frontend/integration-tests/protractor.conf.ts b/frontend/integration-tests/protractor.conf.ts
@@ -91,11 +91,21 @@ export const config: Config = {
     newApp: ['tests/base.scenario.ts', 'tests/overview/overview.scenario.ts', 'tests/source-to-image.scenario.ts', 'tests/deploy-image.scenario.ts'],
     olm: ['tests/base.scenario.ts', 'tests/olm/descriptors.scenario.ts', 'tests/olm/catalog.scenario.ts', 'tests/olm/prometheus.scenario.ts', 'tests/olm/etcd.scenario.ts'],
     olmUpgrade: ['tests/base.scenario.ts', 'tests/olm/update-channel-approval.scenario.ts'],
+    operatorHub: ['tests/base.scenario.ts', 'tests/operator-hub/operator-hub.scenario.ts'],
+    // OLM and OperatorHub
+    olmFull: [
+      'tests/base.scenario.ts',
+      'tests/operator-hub/operator-hub.scenario.ts',
+      'tests/olm/descriptors.scenario.ts',
+      'tests/olm/catalog.scenario.ts',
+      'tests/olm/prometheus.scenario.ts',
+      'tests/olm/etcd.scenario.ts',
+    ],
     performance: ['tests/base.scenario.ts', 'tests/performance.scenario.ts'],
     serviceCatalog: ['tests/base.scenario.ts', 'tests/service-catalog/service-catalog.scenario.ts', 'tests/service-catalog/service-broker.scenario.ts', 'tests/service-catalog/service-class.scenario.ts', 'tests/service-catalog/service-binding.scenario.ts', 'tests/developer-catalog.scenario.ts'],
-    operatorHub: ['tests/base.scenario.ts', 'tests/operator-hub/operator-hub.scenario.ts'],
     overview: ['tests/base.scenario.ts', 'tests/overview/overview.scenario.ts'],
-    e2e: ['tests/base.scenario.ts',
+    e2e: [
+      'tests/base.scenario.ts',
       'tests/crud.scenario.ts',
       'tests/secrets.scenario.ts',
       'tests/filter.scenario.ts',
@@ -105,12 +115,9 @@ export const config: Config = {
       'tests/source-to-image.scenario.ts',
       'tests/deploy-image.scenario.ts',
       'tests/performance.scenario.ts',
-      'tests/olm/descriptors.scenario.ts',
-      'tests/olm/catalog.scenario.ts',
-      'tests/operator-hub/operator-hub.scenario.ts',
-      'tests/olm/prometheus.scenario.ts',
-      'tests/olm/etcd.scenario.ts'],
-    all: ['tests/base.scenario.ts',
+    ],
+    all: [
+      'tests/base.scenario.ts',
       'tests/crud.scenario.ts',
       'tests/overview/overview.scenareio.ts',
       'tests/secrets.scenario.ts',
@@ -121,7 +128,8 @@ export const config: Config = {
       'tests/source-to-image.scenario.ts',
       'tests/deploy-image.scenario.ts',
       'tests/operator-hub/operator-hub.scenario.ts',
-      'tests/developer-catalog.scenario.ts'],
+      'tests/developer-catalog.scenario.ts',
+    ],
   },
   params: {
     // Set to 'true' to enable OpenShift resources in the crud scenario.

diff --git a/test-prow-e2e.sh b/test-prow-e2e.sh
@@ -22,4 +22,4 @@ export BRIDGE_AUTH_PASSWORD="$(cat "${INSTALLER_DIR}/auth/kubeadmin-password")"
 set -x
 export BRIDGE_BASE_ADDRESS="https://$(oc get route console -n openshift-console -o jsonpath='{.spec.host}')"
 
-./test-gui.sh e2e
+./test-gui.sh ${1:-e2e}