From 8d08016b6e5985569ca5d04ef3e2690e78809f54 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 11:38:19 -0300
Subject: [test] use tox and couchdb image to run tests

---
 scripts/docker/Makefile             | 17 +++++++++++------
 scripts/docker/files/bin/run-tox.sh | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100755 scripts/docker/files/bin/run-tox.sh

(limited to 'scripts')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 4fa2e264..6f30a341 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -27,11 +27,14 @@ MEMORY               ?= 512m
 # Docker image generation (main make target) #
 ##############################################
 
-all: image
+all: soledad-image couchdb-image
 
-image:
+soledad-image:
 	docker build -t $(IMAGE_NAME) .
 
+couchdb-image:
+	docker pull couchdb
+
 ##################################################
 # Run a Soledad Server inside a docker container #
 ##################################################
@@ -69,16 +72,18 @@ run-client-bootstrap:
 	  /usr/local/soledad/run-client-bootstrap.sh
 
 #################################################
-# Run all trial tests inside a docker container #
+# Run all tests inside a docker container       #
 #################################################
 
-run-trial:
+run-tox:
+	docker run -d --name couchdb couchdb
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
 	  --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \
+	  --link couchdb \
 	  $(IMAGE_NAME) \
-	  /usr/local/soledad/run-trial.sh
+	  /usr/local/soledad/run-tox.sh
 
 ############################################
 # Performance tests and graphic generation #
@@ -123,7 +128,7 @@ cp-perf-result:
 # Other helper targets #
 ########################
 
-run-shell: image
+run-shell: soledad-image
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  $(IMAGE_NAME) \
diff --git a/scripts/docker/files/bin/run-tox.sh b/scripts/docker/files/bin/run-tox.sh
new file mode 100755
index 00000000..793ce6e1
--- /dev/null
+++ b/scripts/docker/files/bin/run-tox.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+REPO=/builds/leap/soledad/testing
+
+if [ ! -z "${SOLEDAD_REMOTE}" ]; then
+  git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
+  git -C ${REPO} fetch origin
+fi
+
+if [ ! -z "${SOLEDAD_BRANCH}" ]; then
+  git -C ${REPO} checkout ${SOLEDAD_BRANCH}
+fi
+
+(cd ${REPO}; tox -- -v --durations 0 --couch-url http://couchdb:5984)
-- 
cgit v1.2.3