Merge pull request sclorg#467 from sclorg/support_cvp

This pull request adds support for testing container in CVP pipeline

Author: phracek

common

@@ -0,0 +1 @@
+../imagestreams/

test/imagestreams

@@ -10,7 +10,9 @@
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
-source ${THISDIR}/test-lib-postgresql.sh
+source "${THISDIR}/test-lib-postgresql.sh"
+source "${THISDIR}/test-lib-remote-openshift.sh"
+
 TEST_LIST="\
 test_postgresql_integration
 test_postgresql_imagestream
@@ -24,6 +26,8 @@ ct_os_check_compulsory_vars
 
 ct_os_check_login || exit 1
 
+ct_os_tag_image_for_cvp "postgresql"
+
 set -u
 
 # For testing on OpenShift 4 we use internal registry

test/run-openshift-remote-cluster

@@ -29,14 +29,14 @@ function test_postgresql_integration() {
 # Check the imagestream
 function test_postgresql_imagestream() {
   case ${OS} in
-    rhel7|centos7) ;;
+    rhel7|centos7|rhel8) ;;
     *) echo "Imagestream testing not supported for $OS environment." ; return 0 ;;
   esac
   local tag="-el7"
   if [ "${OS}" == "rhel8" ]; then
     tag="-el8"
   fi
-  ct_os_test_image_stream_template "${THISDIR}/../imagestreams/postgresql-${OS%[0-9]*}.json" "${THISDIR}/../examples/postgresql-ephemeral-template.json" postgresql "-p POSTGRESQL_VERSION=${VERSION}${tag}"
+  ct_os_test_image_stream_template "${THISDIR}/imagestreams/postgresql-${OS%[0-9]*}.json" "${THISDIR}/examples/postgresql-ephemeral-template.json" postgresql "-p POSTGRESQL_VERSION=${VERSION}${tag}"
 }
 
 # vim: set tabstop=2:shiftwidth=2:expandtab:

test/test-lib-postgresql.sh

@@ -0,0 +1 @@
+../common/test-openshift.yaml