From e56bb81033f4def96d74c43bb98356314800528a Mon Sep 17 00:00:00 2001 From: Navid Shaikh Date: Fri, 18 Oct 2019 12:04:10 +0530 Subject: [PATCH] Parameterizes e2e timeout and parallel options values - Sets defaults to E2E_TIMEOUT=60m and E2E_PARALLEL=1 - Removes unused variable OLM_NAMESPACE - Uniforms settings values for var in e2e script --- openshift/e2e-tests-openshift.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openshift/e2e-tests-openshift.sh b/openshift/e2e-tests-openshift.sh index 52b478abbc..d2e0671496 100755 --- a/openshift/e2e-tests-openshift.sh +++ b/openshift/e2e-tests-openshift.sh @@ -19,13 +19,14 @@ source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/e2e-tests.sh set -x -readonly TEST_NAMESPACE=client-tests -readonly TEST_NAMESPACE_ALT=client-tests-alt +readonly TEST_NAMESPACE="client-tests" +readonly TEST_NAMESPACE_ALT="client-tests-alt" readonly SERVING_RELEASE="release-v0.8.1" readonly KN_DEFAULT_TEST_IMAGE="gcr.io/knative-samples/helloworld-go" -readonly SERVING_NAMESPACE=knative-serving -readonly SERVICEMESH_NAMESPACE=istio-system -readonly OLM_NAMESPACE="openshift-marketplace" +readonly SERVING_NAMESPACE="knative-serving" +readonly SERVICEMESH_NAMESPACE="istio-system" +readonly E2E_TIMEOUT="60m" +readonly E2E_PARALLEL="1" env @@ -227,7 +228,7 @@ function run_e2e_tests(){ # Add local dir to have access to built kn export PATH=$PATH:${REPO_ROOT_DIR} export GO111MODULE=on - go_test_e2e -timeout=30m -parallel=1 ./test/e2e || fail_test + go_test_e2e -timeout=$E2E_TIMEOUT -parallel=$E2E_PARALLEL ./test/e2e || fail_test return $failed }