mirror of
https://github.com/arangodb/kube-arangodb.git
synced 2024-12-15 17:51:03 +00:00
Fixing test
This commit is contained in:
parent
c7181451f5
commit
3ca48a7568
2 changed files with 20 additions and 7 deletions
8
Makefile
8
Makefile
|
@ -242,13 +242,7 @@ ifneq ($(DEPLOYMENTNAMESPACE), default)
|
||||||
endif
|
endif
|
||||||
kubectl apply -f $(MANIFESTPATH)
|
kubectl apply -f $(MANIFESTPATH)
|
||||||
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
|
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
|
||||||
kubectl --namespace $(DEPLOYMENTNAMESPACE) \
|
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
|
||||||
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)
|
|
||||||
ifneq ($(DEPLOYMENTNAMESPACE), default)
|
ifneq ($(DEPLOYMENTNAMESPACE), default)
|
||||||
kubectl delete namespace $(DEPLOYMENTNAMESPACE) --ignore-not-found --now
|
kubectl delete namespace $(DEPLOYMENTNAMESPACE) --ignore-not-found --now
|
||||||
endif
|
endif
|
||||||
|
|
19
scripts/kube_run_tests.sh
Executable file
19
scripts/kube_run_tests.sh
Executable file
|
@ -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
|
Loading…
Reference in a new issue