tests(rhel) fix rhel image name (#349)

Kong · Oct 26, 2020 · 60f2c3b · 60f2c3b
1 parent 6924e48
commit 60f2c3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/test/build_container.sh b/test/build_container.sh
@@ -26,7 +26,6 @@ if [ "$RESTY_IMAGE_TAG" == "stretch" ] || [ "$RESTY_IMAGE_TAG" == "jessie" ]; th
 fi
 
 if [ "$RESTY_IMAGE_BASE" == "rhel" ]; then
-  sed -i 's/^FROM .*/FROM registry.access.redhat.com\/ubi'${RESTY_IMAGE_TAG}'\/ubi/' docker-kong/rhel/Dockerfile
   sed -i 's/rhel7/rhel'${RESTY_IMAGE_TAG}'/' docker-kong/rhel/Dockerfile
   cp output/*.rhel${RESTY_IMAGE_TAG}.${ARCHITECTURE}.rpm docker-kong/rhel/kong.rpm
   BUILD_DIR="rhel"
@@ -41,4 +40,4 @@ pushd docker-kong/${BUILD_DIR}
     docker run -t $KONG_TEST_IMAGE_NAME kong version
 popd
 
-rm -rf docker-kong || true
+rm -rf docker-kong || true
diff --git a/test/tests/01-package/run.sh b/test/tests/01-package/run.sh
@@ -1,6 +1,10 @@
 set -x
 
-docker run -d --name user-validation-tests --rm -e KONG_DATABASE=off -v $PWD:/src ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} tail -f /dev/null
+if [[ "$RESTY_IMAGE_BASE" == "rhel" ]]; then
+  docker run -d --name user-validation-tests --rm -e KONG_DATABASE=off -v $PWD:/src registry.access.redhat.com/ubi${RESTY_IMAGE_TAG}/ubi tail -f /dev/null
+else
+  docker run -d --name user-validation-tests --rm -e KONG_DATABASE=off -v $PWD:/src ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} tail -f /dev/null
+fi
 
 if [[ "$PACKAGE_TYPE" == "rpm" ]]; then
   cp $PACKAGE_LOCATION/*amd64.rpm kong.rpm