add a way to run conu tests in a container

Related: sclorg/s2i-ruby-container#167

Signed-off-by: Tomas Tomecek <[email protected]>

Author: TomasTomecek

common.mk

@@ -31,6 +31,7 @@ endif
 
 SKIP_SQUASH ?= 1
 DOCKER_BUILD_CONTEXT ?= .
+TEST_ENV := local
 
 script_env = \
 	SKIP_SQUASH=$(SKIP_SQUASH)                      \
@@ -39,7 +40,8 @@ script_env = \
 	CLEAN_AFTER=$(CLEAN_AFTER)                      \
 	DOCKER_BUILD_CONTEXT=$(DOCKER_BUILD_CONTEXT)    \
 	OPENSHIFT_NAMESPACES="$(OPENSHIFT_NAMESPACES)"  \
-	CUSTOM_REPO="$(CUSTOM_REPO)"
+	CUSTOM_REPO="$(CUSTOM_REPO)"                    \
+	TEST_ENV="$(TEST_ENV)"
 
 # TODO: switch to 'build: build-all' once parallel builds are relatively safe
 .PHONY: build build-serial build-all

test.sh

@@ -15,7 +15,12 @@ for dir in ${VERSIONS}; do
   # Kept also IMAGE_NAME as some tests might still use that.
   export IMAGE_NAME=$(docker inspect -f "{{.Config.Labels.name}}" $IMAGE_ID)
 
-  if [ -n "${TEST_MODE}" ]; then
+  if [ "${TEST_ENV}" == "container" ]; then
+    TEST_IMAGE_NAME="sclorg-tests"
+    # FIXME: poke user-cont to provide such container image
+    docker build --tag=${TEST_IMAGE_NAME} -f Dockerfile.tests $(readlink -f ../)
+    docker run --net=host -e PYTHONDONTWRITEBYTECODE=yes -e IMAGE_NAME --rm -v /dev:/dev:ro -v /var/lib/docker:/var/lib/docker:ro --security-opt label=disable --cap-add SYS_ADMIN -ti -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/src -w /src ${TEST_IMAGE_NAME} pytest-3 -vv
+  elif [ -n "${TEST_MODE}" -o "${TEST_ENV}" == "local" ]; then
     VERSION=$dir test/run
   fi