File tree 1 file changed +6
-1
lines changed
1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -14,13 +14,18 @@ source "${THISDIR}"/test-lib-remote-openshift.sh
14
14
15
15
function test_postgresql_integration() {
16
16
local service_name=postgresql
17
+ if [ " ${OS} " == " rhel7" ]; then
18
+ namespace_image=" rhscl/postgresql-${VERSION} -rhel7"
19
+ else
20
+ namespace_image=" ${OS} /postgresql-${VERSION} "
21
+ fi
17
22
TEMPLATES=" postgresql-ephemeral-template.json
18
23
postgresql-persistent-template.json"
19
24
for template in $TEMPLATES ; do
20
25
ct_os_test_template_app_func " ${IMAGE_NAME} " \
21
26
" ${THISDIR} /examples/${template} " \
22
27
" ${service_name} " \
23
- " ct_os_check_cmd_internal 'registry.redhat.io/${OS} /postgresql- ${VERSION } ' '${service_name} -testing' 'PGPASSWORD=testp pg_isready -t 15 -h <IP> -U testu -d testdb' 'accepting connections' 120" \
28
+ " ct_os_check_cmd_internal 'registry.redhat.io/${namespace_image } ' '${service_name} -testing' 'PGPASSWORD=testp pg_isready -t 15 -h <IP> -U testu -d testdb' 'accepting connections' 120" \
24
29
" -p POSTGRESQL_VERSION=${VERSION} \
25
30
-p DATABASE_SERVICE_NAME=" ${service_name} -testing" \
26
31
-p POSTGRESQL_USER=testu \
You can’t perform that action at this time.
0 commit comments