Merge pull request #415 from phracek/fix_typo_run_openshift

Fix typo in OpenShift 3 tests
This commit is contained in:
phracek 2021-08-11 13:50:51 +00:00
commit abffd4737c
11 changed files with 279 additions and 62 deletions

View file

@ -8,8 +8,9 @@
THISDIR=$(dirname ${BASH_SOURCE[0]})
source ${THISDIR}/test-lib.sh
source ${THISDIR}/test-lib-openshift.sh
source "${THISDIR}"/test-lib.sh
source "${THISDIR}"/test-lib-openshift.sh
source "${THISDIR}"/test-lib-remote-openshift.sh
function test_postgresql_integration() {
local image_name=$1
@ -32,8 +33,11 @@ function test_postgresql_imagestream() {
rhel7|centos7) ;;
*) echo "Imagestream testing not supported for $OS environment." ; return 0 ;;
esac
ct_os_test_image_stream_template "${THISDIR}/../imagestreams/postgresql-${OS%[0-9]*}.json" "${THISDIR}/../examples/postgresql-ephemeral-template.json" postgresql "-p POSTGRESQL_VERSION=${VERSION}"
local tag="-el7"
if [ x"${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}"
}
# vim: set tabstop=2:shiftwidth=2:expandtab: