diff --git a/.ibm/pipelines/windows-test-script.ps1 b/.ibm/pipelines/windows-test-script.ps1 index d19b27b18..29f40cd00 100644 --- a/.ibm/pipelines/windows-test-script.ps1 +++ b/.ibm/pipelines/windows-test-script.ps1 @@ -51,8 +51,8 @@ function Run-Test { $GOCACHE="$(Get-Location)\.gocache" mkdir $GOCACHE - [Environment]::SetEnvironmentVariable("GOCACHE", "$GOCACHE") - + [Environment]::SetEnvironmentVariable("GOCACHE", "$GOCACHE") + [Environment]::SetEnvironmentVariable("TEST_EXEC_NODES", "$TEST_EXEC_NODES") [Environment]::SetEnvironmentVariable("SKIP_USER_LOGIN_TESTS","true") Shout "Login IBMcloud" @@ -91,6 +91,7 @@ $IBM_OPENSHIFT_ENDPOINT=$args[3] $LOGFILE=$args[4] $REPO=$args[5] $CLUSTER_ID=$args[6] +$TEST_EXEC_NODES=$args[7] Shout "Args Recived" # Pre test cleanup diff --git a/.ibm/pipelines/windows-test.sh b/.ibm/pipelines/windows-test.sh index aaca7a334..497b821e7 100755 --- a/.ibm/pipelines/windows-test.sh +++ b/.ibm/pipelines/windows-test.sh @@ -13,7 +13,8 @@ export REPO=${REPO:-"https://github.com/redhat-developer/odo"} sshpass -p $WINDOWS_PASSWORD scp -o StrictHostKeyChecking=no ./.ibm/pipelines/windows-test-script.ps1 Administrator@$WINDOWS_IP:/tmp/windows-test-script.ps1 #execute test from the test script -sshpass -p $WINDOWS_PASSWORD ssh Administrator@$WINDOWS_IP -o StrictHostKeyChecking=no powershell /tmp/windows-test-script.ps1 "${GIT_PR_NUMBER}" "${BUILD_NUMBER}" "${API_KEY_QE}" "${IBM_OPENSHIFT_ENDPOINT}" "${LOGFILE}" "${REPO}" "${WINDOWS_IP}" "${CLUSTER_ID}" +export TEST_EXEC_NODES=${TEST_EXEC_NODES:-"16"} +sshpass -p $WINDOWS_PASSWORD ssh Administrator@$WINDOWS_IP -o StrictHostKeyChecking=no powershell /tmp/windows-test-script.ps1 "${GIT_PR_NUMBER}" "${BUILD_NUMBER}" "${API_KEY_QE}" "${IBM_OPENSHIFT_ENDPOINT}" "${LOGFILE}" "${REPO}" "${WINDOWS_IP}" "${CLUSTER_ID}" "${TEST_EXEC_NODES}" RESULT=$? echo "RESULT: $RESULT" diff --git a/Makefile b/Makefile index 569ecada9..c624f567b 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,8 @@ export ODO_LOG_LEVEL ?= 4 # To enable verbosity export or set env GINKGO_TEST_ARGS like "GINKGO_TEST_ARGS=-v" UNIT_TEST_ARGS ?= +export ARTIFACT_DIR ?= . + GINKGO_FLAGS_ALL = $(GINKGO_TEST_ARGS) --randomize-all --slow-spec-threshold=$(SLOW_SPEC_THRESHOLD) -timeout $(TIMEOUT) --no-color # Flags for tests that must not be run in parallel. diff --git a/scripts/configure-cluster/common/setup-operators.sh b/scripts/configure-cluster/common/setup-operators.sh index 00259ce77..7e60a92af 100755 --- a/scripts/configure-cluster/common/setup-operators.sh +++ b/scripts/configure-cluster/common/setup-operators.sh @@ -1,6 +1,24 @@ #!/bin/bash set -x +install_sourceCatalog(){ + $1 create -f - <