From 21828466a842654cc81da177ffe536a07578ea46 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 19 Sep 2016 19:54:49 +0200
Subject: [PATCH] Add script to bootstrap test environment.

---
 .travis.yml                          |  5 +----
 src/test/bash/create_certificates.sh |  6 ++++--
 src/test/bash/start.sh               | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100755 src/test/bash/start.sh

diff --git a/.travis.yml b/.travis.yml
index 434f2caf..1f118cad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,7 @@ env:
     - VAULT_VER=0.6.1
 
 install:
-  - mkdir -p download
-  - src/test/bash/create_certificates.sh
-  - src/test/bash/install_vault.sh
-  - src/test/bash/local_run_vault.sh &
+  - src/test/bash/start.sh
 
 script: mvn clean verify
 
diff --git a/src/test/bash/create_certificates.sh b/src/test/bash/create_certificates.sh
index a93a55af..cc1b6025 100755
--- a/src/test/bash/create_certificates.sh
+++ b/src/test/bash/create_certificates.sh
@@ -96,8 +96,10 @@ openssl pkcs12 -export -clcerts \
       -passout pass:changeit \
       -out ${CA_DIR}/client.p12
 
-${JAVA_HOME}/bin/keytool -importcert -keystore ${KEYSTORE_FILE} -file ${CA_DIR}/certs/ca.cert.pem -noprompt -storepass changeit
-${JAVA_HOME}/bin/keytool -importkeystore \
+KEYTOOL=${JAVA_HOME}/bin/keytool
+
+${KEYTOOL} -importcert -keystore ${KEYSTORE_FILE} -file ${CA_DIR}/certs/ca.cert.pem -noprompt -storepass changeit
+${KEYTOOL} -importkeystore \
                               -srckeystore ${CA_DIR}/client.p12 -srcstoretype PKCS12 -srcstorepass changeit\
                               -destkeystore ${CLIENT_CERT_KEYSTORE} -deststoretype JKS \
                               -noprompt -storepass changeit
diff --git a/src/test/bash/start.sh b/src/test/bash/start.sh
new file mode 100755
index 00000000..ef56786c
--- /dev/null
+++ b/src/test/bash/start.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+###########################################################################
+# Prepare all the things required to run Vault                            #
+###########################################################################
+
+BASEDIR=`dirname $0`/../../..
+
+# Just in case...
+pkill vault
+
+mkdir -p ${BASEDIR}/download
+${BASEDIR}/src/test/bash/install_vault.sh
+${BASEDIR}/src/test/bash/create_certificates.sh
+${BASEDIR}/src/test/bash/local_run_vault.sh > /dev/null 2>&1 &