From 76acb8f39a32b6b61f00af571bae9bd48c0a5d62 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 21:51:45 -0300
Subject: [test] use random name for couchdb container in docker perf test

---
 scripts/docker/Makefile              | 15 ++++++++++-----
 scripts/docker/files/bin/run-perf.sh | 20 ++++++++++++++++++++
 scripts/docker/files/bin/run-tox.sh  |  5 ++++-
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100755 scripts/docker/files/bin/run-perf.sh

(limited to 'scripts')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 6ad4cced..4b4d4496 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -76,12 +76,14 @@ run-client-bootstrap:
 #################################################
 
 run-tox:
-	docker run -d --name couchdb couchdb
+	name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \
+	docker run -d --name $${name} couchdb; \
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
 	  --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \
-	  --link couchdb \
+	  --env="COUCH_URL=http://$${name}:5984" \
+	  --link $${name} \
 	  $(IMAGE_NAME) \
 	  /usr/local/soledad/run-tox.sh
 
@@ -90,14 +92,17 @@ run-tox:
 ############################################
 
 run-perf:
-	docker run -d --name couchdb couchdb
+	name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \
+	docker run -d --name $${name} couchdb; \
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
 	  --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \
-	  --link couchdb \
+	  --env="SOLEDAD_PRELOAD_NUM=$(SOLEDAD_PRELOAD_NUM)" \
+	  --env="COUCH_URL=http://$${name}:5984" \
+	  --link $${name} \
 	  $(IMAGE_NAME) \
-	  /usr/local/soledad/run-tox-perf.sh
+	  /usr/local/soledad/run-perf.sh
 
 run-client-perf:
 	@if [ -z "$(CONTAINER_ID_FILE)" ]; then \
diff --git a/scripts/docker/files/bin/run-perf.sh b/scripts/docker/files/bin/run-perf.sh
new file mode 100755
index 00000000..35c7f006
--- /dev/null
+++ b/scripts/docker/files/bin/run-perf.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+REPO=/builds/leap/soledad/testing
+COUCH_URL="${COUCH_URL:-http://127.0.0.1:5984}"
+
+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 perf -- \
+	--durations 0 \
+	--couch-url ${COUCH_URL} \
+	--twisted
diff --git a/scripts/docker/files/bin/run-tox.sh b/scripts/docker/files/bin/run-tox.sh
index 793ce6e1..74fde182 100755
--- a/scripts/docker/files/bin/run-tox.sh
+++ b/scripts/docker/files/bin/run-tox.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 REPO=/builds/leap/soledad/testing
+COUCH_URL="${COUCH_URL:-http://127.0.0.1:5984}"
 
 if [ ! -z "${SOLEDAD_REMOTE}" ]; then
   git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
@@ -11,4 +12,6 @@ if [ ! -z "${SOLEDAD_BRANCH}" ]; then
   git -C ${REPO} checkout ${SOLEDAD_BRANCH}
 fi
 
-(cd ${REPO}; tox -- -v --durations 0 --couch-url http://couchdb:5984)
+cd ${REPO}
+
+tox -- --couch-url ${COUCH_URL}
-- 
cgit v1.2.3