Update from upstream Github repository

test/run-openshift

@@ -10,11 +10,15 @@ THISDIR=$(dirname ${BASH_SOURCE[0]})
 
 source "${THISDIR}/test-lib.sh"
 source "${THISDIR}/test-lib-openshift.sh"
+source "${THISDIR}/test-lib-python.sh"
 
-set -exo nounset
+set -eo nounset
 
-test -n "${IMAGE_NAME-}" || false 'make sure $IMAGE_NAME is defined'
-test -n "${VERSION-}" || false 'make sure $VERSION is defined'
+trap ct_os_cleanup EXIT SIGINT
+
+ct_os_check_compulsory_vars
+
+ct_os_enable_print_logs
 
 if [ -z "${EPHEMERAL_TEMPLATES:-}" ]; then
     EPHEMERAL_TEMPLATES="
@@ -36,3 +40,13 @@ for template in $EPHEMERAL_TEMPLATES; do
                             8080 http 200 "-p SOURCE_REPOSITORY_REF=master -p PYTHON_VERSION=${VERSION} -p POSTGRESQL_VERSION=9.6 -p NAME=python-testing" \
                             "centos/postgresql-96-centos7|postgresql:9.6"
 done
+
+# Check the imagestream
+test_python_imagestream
+
+OS_TESTSUITE_RESULT=0
+
+ct_os_cluster_down
+
+# vim: set tabstop=2:shiftwidth=2:expandtab:
+