From 449aaefa3a95df6f5700b645d6113458f7fde015 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Fri, 10 Jun 2016 14:40:51 -0300
Subject: [test] improve repo config and checkout on docker scripts

---
 scripts/docker/files/run-perf-test.sh     | 12 ++++++------
 scripts/docker/files/start-client-test.sh |  4 ++--
 scripts/docker/files/start-server.sh      |  5 +++--
 scripts/docker/files/start-trial-test.sh  |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/files/run-perf-test.sh b/scripts/docker/files/run-perf-test.sh
index 80138b2a..ebd54d23 100755
--- a/scripts/docker/files/run-perf-test.sh
+++ b/scripts/docker/files/run-perf-test.sh
@@ -32,8 +32,8 @@ TIMEOUT=20
 #-----------------------------------------------------------------------------
 
 if [ ! -z "${SOLEDAD_REMOTE}" ]; then
-  git -C ${REPO} remote add test ${SOLEDAD_REMOTE}
-  git -C ${REPO} fetch test
+  git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
+  git -C ${REPO} fetch origin
 fi
 
 if [ ! -z "${SOLEDAD_BRANCH}" ]; then
@@ -41,8 +41,8 @@ if [ ! -z "${SOLEDAD_BRANCH}" ]; then
 fi
 
 if [ ! -z "${SOLEDAD_PERF_REMOTE}" ]; then
-  git -C /var/local/soledad-perf remote add test ${SOLEDAD_PERF_REMOTE}
-  git -C /var/local/soledad-perf fetch test
+  git -C /var/local/soledad-perf remote set-url origin ${SOLEDAD_PERF_REMOTE}
+  git -C /var/local/soledad-perf fetch origin
 fi
 
 if [ ! -z "${SOLEDAD_PERF_BRANCH}" ]; then
@@ -105,12 +105,12 @@ if [ ${elapsed} -ge ${TIMEOUT} ]; then
   exit 1
 fi
 
-sleep 2
-
 #-----------------------------------------------------------------------------
 # create docs and run test
 #-----------------------------------------------------------------------------
 
+#set -e
+
 # create documents in client
 make trigger-create-docs
 
diff --git a/scripts/docker/files/start-client-test.sh b/scripts/docker/files/start-client-test.sh
index 5997385f..9dec3371 100755
--- a/scripts/docker/files/start-client-test.sh
+++ b/scripts/docker/files/start-client-test.sh
@@ -9,8 +9,8 @@ CMD="/usr/local/soledad/test-env.py"
 REPO="/var/local/soledad"
 
 if [ ! -z "${SOLEDAD_REMOTE}" ]; then
-  git -C ${REPO} remote add test ${SOLEDAD_REMOTE}
-  git -C ${REPO} fetch test
+  git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
+  git -C ${REPO} fetch origin
 fi
 
 if [ ! -z "${SOLEDAD_BRANCH}" ]; then
diff --git a/scripts/docker/files/start-server.sh b/scripts/docker/files/start-server.sh
index b9b5e4ad..0980d352 100755
--- a/scripts/docker/files/start-server.sh
+++ b/scripts/docker/files/start-server.sh
@@ -27,8 +27,8 @@ CMD="/usr/local/soledad/test-env.py"
 REPO="/var/local/soledad"
 
 if [ ! -z "${SOLEDAD_REMOTE}" ]; then
-  git -C ${REPO} remote add test ${SOLEDAD_REMOTE}
-  git -C ${REPO} fetch test
+  git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
+  git -C ${REPO} fetch origin
 fi
 
 if [ ! -z "${SOLEDAD_BRANCH}" ]; then
@@ -80,4 +80,5 @@ fi
 # actually run the server
 #---------------------------------------------------------------------------
 
+echo "Starting soledad server..."
 ${CMD} soledad-server start --no-daemonize
diff --git a/scripts/docker/files/start-trial-test.sh b/scripts/docker/files/start-trial-test.sh
index 15638b65..ad139288 100755
--- a/scripts/docker/files/start-trial-test.sh
+++ b/scripts/docker/files/start-trial-test.sh
@@ -9,8 +9,8 @@ CMD="/usr/local/soledad/test-env.py"
 REPO="/var/local/soledad"
 
 if [ ! -z "${SOLEDAD_REMOTE}" ]; then
-  git -C ${REPO} remote add test ${SOLEDAD_REMOTE}
-  git -C ${REPO} fetch test
+  git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
+  git -C ${REPO} fetch origin
 fi
 
 if [ ! -z "${SOLEDAD_BRANCH}" ]; then
-- 
cgit v1.2.3