File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change 10
10
11
11
THISDIR=$( dirname ${BASH_SOURCE[0]} )
12
12
13
- source ${THISDIR} /test-lib-postgresql.sh
13
+ source " ${THISDIR} /test-lib-postgresql.sh"
14
+ source " ${THISDIR} /test-lib-remote-openshift.sh"
15
+
14
16
TEST_LIST=" \
15
17
test_postgresql_integration
16
18
test_postgresql_imagestream
@@ -24,6 +26,8 @@ ct_os_check_compulsory_vars
24
26
25
27
ct_os_check_login || exit 1
26
28
29
+ ct_os_tag_image_for_cvp " postgresql"
30
+
27
31
set -u
28
32
29
33
# For testing on OpenShift 4 we use internal registry
Original file line number Diff line number Diff line change @@ -29,14 +29,14 @@ function test_postgresql_integration() {
29
29
# Check the imagestream
30
30
function test_postgresql_imagestream() {
31
31
case ${OS} in
32
- rhel7|centos7) ;;
32
+ rhel7|centos7|rhel8 ) ;;
33
33
* ) echo " Imagestream testing not supported for $OS environment." ; return 0 ;;
34
34
esac
35
35
local tag=" -el7"
36
36
if [ " ${OS} " == " rhel8" ]; then
37
37
tag=" -el8"
38
38
fi
39
- 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} "
39
+ 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} "
40
40
}
41
41
42
42
# vim: set tabstop=2:shiftwidth=2:expandtab:
You can’t perform that action at this time.
0 commit comments