Adjust test script to support different providers
@@ -57,16 +57,16 @@ curl -LO https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
export VAGRANT_DOTFILE_PATH="${VAGRANT_DOTFILE_PATH:-$WORKSPACE/.vagrant}"
# Make sure that the VM is properly shut down on exit
-trap '{ vagrant halt; }' EXIT
+trap '{ cluster/down.sh; }' EXIT
set +e
# TODO handle complete workspace removal on CI
-vagrant up --provider=libvirt
+cluster/up.sh
if [ $? -ne 0 ]; then
vagrant destroy
set -e
- vagrant up --provider=libvirt
+ cluster/up.sh
fi
set -e
@@ -75,9 +75,6 @@ go get golang.org/x/tools/cmd/goimports
go get -u github.com/Masterminds/glide
make
-# Copy connection details for kubernetes
-cluster/kubectl.sh --init
-
# Make sure we can connect to kubernetes
export APISERVER=$(cat cluster/vagrant/.kubeconfig | grep server | sed -e 's# \+server: https://##' | sed -e 's/\r//')
$WORKSPACE/dockerize -wait tcp://$APISERVER -timeout 300s
