diff --git a/build/scripts/oc-tests/oc-common.sh b/build/scripts/oc-tests/oc-common.sh index 25897343d..5e761e2f4 100644 --- a/build/scripts/oc-tests/oc-common.sh +++ b/build/scripts/oc-tests/oc-common.sh @@ -22,7 +22,7 @@ catchFinish() { local RESULT=$? # Collect all Eclipse Che logs - set +e && chectl server:logs -n $NAMESPACE -d $ARTIFACTS_DIR && set -e + set +e && chectl server:logs -n $NAMESPACE -d $ARTIFACTS_DIR --telemetry off && set -e [[ "${RESULT}" != "0" ]] && echo "[ERROR] Job failed." || echo "[INFO] Job completed successfully." rm -rf ${OPERATOR_REPO}/tmp diff --git a/build/scripts/oc-tests/oc-test-operator.sh b/build/scripts/oc-tests/oc-test-operator.sh index 61caf8fff..f9dda849a 100755 --- a/build/scripts/oc-tests/oc-test-operator.sh +++ b/build/scripts/oc-tests/oc-test-operator.sh @@ -19,6 +19,8 @@ source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh" #Stop execution on any error trap "catchFinish" EXIT SIGINT +[[ -z "${CI_CHE_OPERATOR_IMAGE}" ]] && { echo [ERROR] CI_CHE_OPERATOR_IMAGE not defined; exit 1; } + runTests() { # CI_CHE_OPERATOR_IMAGE it is che operator image built in openshift CI job workflow. # More info about how works image dependencies in ci:https://github.com/openshift/ci-tools/blob/master/TEMPLATES.md#parameters-available-to-templates diff --git a/build/scripts/oc-tests/oc-test-upgrade-from-stable-to-next.sh b/build/scripts/oc-tests/oc-test-upgrade-from-stable-to-next.sh index 72dda6cac..5ab82c39d 100755 --- a/build/scripts/oc-tests/oc-test-upgrade-from-stable-to-next.sh +++ b/build/scripts/oc-tests/oc-test-upgrade-from-stable-to-next.sh @@ -26,6 +26,8 @@ trap "catchFinish" EXIT SIGINT unset OPERATOR_TEST_NAMESPACE +[[ -z "${CI_CHE_OPERATOR_IMAGE}" ]] && { echo [ERROR] CI_CHE_OPERATOR_IMAGE not defined; exit 1; } + # Discover test namespace # Eclipse Che subscription is pre-created by OpenShift CI discoverOperatorTestNamespace() {