Simplify tests

Author: hhorak

common

@@ -104,25 +104,19 @@ test_mongodb_replication "${IMAGE_NAME}"
 
 # test with the just built image and an integrated template
 echo "Running test_mongodb_integration with ${IMAGE_NAME}"
-test_mongodb_integration "${IMAGE_NAME}" "${VERSION}" mongodb
+test_mongodb_integration "${IMAGE_NAME}"
 
 # test with a released image and an integrated template
-# ignore possible failure of this test for centos images
-fail_not_released=true
-if [ "${OS}" == "rhel7" ] ; then
-  PUBLIC_IMAGE_NAME=${PUBLIC_IMAGE_NAME:-${REGISTRY:-registry.redhat.io/}rhscl/${BASE_IMAGE_NAME}-${VERSION//./}-rhel7}
-else
-  PUBLIC_IMAGE_NAME=${PUBLIC_IMAGE_NAME:-${REGISTRY:-}centos/${BASE_IMAGE_NAME}-${VERSION//./}-centos7}
-  fail_not_released=false
-fi
+PUBLIC_IMAGE_NAME=${PUBLIC_IMAGE_NAME:-$(ct_get_public_image_name "${OS}" "${BASE_IMAGE_NAME}" "${VERSION}")}
 
 # Try pulling the image first to see if it is accessible
 if docker pull "${PUBLIC_IMAGE_NAME}"; then
   echo "Running test_mongodb_integration with ${PUBLIC_IMAGE_NAME}"
-  test_mongodb_integration "${PUBLIC_IMAGE_NAME}" "${VERSION}" mongodb
+  test_mongodb_integration "${PUBLIC_IMAGE_NAME}"
 else
   echo "Warning: ${PUBLIC_IMAGE_NAME} could not be downloaded via 'docker'"
-  ! $fail_not_released || false "ERROR: Failed to pull image"
+  # ignore possible failure of this test for centos images
+  [ "${OS}" == "rhel7" ] && false "ERROR: Failed to pull image"
 fi
 
 # Check the imagestream

test/run-openshift-local-cluster

@@ -25,7 +25,7 @@ export CT_SKIP_UPLOAD_IMAGE=true
 export CT_NAMESPACE=openshift
 
 # Check the template
-test_mongodb_integration "${IMAGE_NAME}" ${VERSION} mongodb
+test_mongodb_integration "${IMAGE_NAME}"
 
 # Check the imagestream
 test_mongodb_imagestream

test/run-openshift-remote-cluster

@@ -13,9 +13,7 @@ source ${THISDIR}/test-lib-openshift.sh
 
 function test_mongodb_integration() {
   local image_name=$1
-  local VERSION=$2
-  local service_name=$3
-  local image_tagged="${service_name}:${VERSION}"
+  local service_name=mongodb
   ct_os_template_exists mongodb-ephemeral && t=mongodb-ephemeral || t=mongodb-persistent
   ct_os_test_template_app_func "${image_name}" \
                                "${t}" \