Skip to content

Run OLM and OperatorHub tests as a separate suite in CI #1282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 13, 2019
+18 −10
Merged

Run OLM and OperatorHub tests as a separate suite in CI #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions frontend/integration-tests/protractor.conf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test-prow-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}