add a new target to invoke tests using conu library

Required-by: s2i-ruby-container#167

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

common.mk

@@ -87,6 +87,11 @@ test: script_env += TEST_MODE=true
 test: tag
 	VERSIONS="$(VERSIONS)" $(script_env) $(test)
 
+.PHONY: test-with-conu
+test-with-conu: script_env += TEST_CONU_MODE=true
+test-with-conu: tag
+	VERSIONS="$(VERSIONS)" $(script_env) $(test)
+
 .PHONY: test-openshift
 test-openshift: script_env += TEST_OPENSHIFT_MODE=true
 test-openshift: tag

test.sh

@@ -19,6 +19,27 @@ for dir in ${VERSIONS}; do
     VERSION=$dir test/run
   fi
 
+  if [ -n "${TEST_CONU_MODE}" ]; then
+    if [[ -x test/run-conu ]]; then
+      docker run \
+        --net=host \
+        -e VERSION=$dir \
+        -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 \
+        docker.io/usercont/conu:0.6.2 \
+        test/run-conu
+    else
+      echo "-> conu tests are not present, skipping"
+    fi
+  fi
+
   if [ -n "${TEST_OPENSHIFT_MODE}" ]; then
     if [[ -x test/run-openshift ]]; then
       VERSION=$dir test/run-openshift