File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 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
1414
1515function test_postgresql_integration() {
1616 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
1722 TEMPLATES=" postgresql-ephemeral-template.json
1823 postgresql-persistent-template.json"
1924 for template in $TEMPLATES ; do
2025 ct_os_test_template_app_func " ${IMAGE_NAME} " \
2126 " ${THISDIR} /examples/${template} " \
2227 " ${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" \
2429 " -p POSTGRESQL_VERSION=${VERSION} \
2530 -p DATABASE_SERVICE_NAME=" ${service_name} -testing" \
2631 -p POSTGRESQL_USER=testu \
You can’t perform that action at this time.
0 commit comments