Merge branch 'master' into operator-split

Author: ewoutp

Makefile

@@ -245,13 +245,7 @@ endif
 	kubectl apply -f $(MANIFESTPATHSTORAGE)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
 	$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
-	kubectl --namespace $(DEPLOYMENTNAMESPACE) \
-		run arangodb-operator-test -i --rm --quiet --restart=Never \
-		--image=$(shell docker inspect $(TESTIMAGE) '--format={{index .RepoDigests 0}}') \
-		--env="ENTERPRISEIMAGE=$(ENTERPRISEIMAGE)" \
-		--env="TEST_NAMESPACE=$(DEPLOYMENTNAMESPACE)" \
-		-- \
-		-test.v -test.timeout $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
+	$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
 ifneq ($(DEPLOYMENTNAMESPACE), default)
 	kubectl delete namespace $(DEPLOYMENTNAMESPACE) --ignore-not-found --now
 endif

scripts/kube_run_tests.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Run kubectl run to run the integration tests.
+
+DEPLOYMENTNAMESPACE=$1
+TESTIMAGE=$2
+ENTERPRISEIMAGE=$3
+TESTTIMEOUT=$4
+TESTLENGTHOPTIONS=$5
+
+IMAGEID=$(docker inspect ${TESTIMAGE} '--format={{index .RepoDigests 0}}')
+
+kubectl --namespace ${DEPLOYMENTNAMESPACE} \
+    run arangodb-operator-test -i --rm --quiet --restart=Never \
+    --image=${IMAGEID} \
+    --env="ENTERPRISEIMAGE=${ENTERPRISEIMAGE}" \
+    --env="TEST_NAMESPACE=${DEPLOYMENTNAMESPACE}" \
+    -- \
+    -test.v -test.timeout $TESTTIMEOUT $TESTLENGTHOPTIONS