Merge commit 'c73f89c561b2e686d2898b0c8dea8c0bd327e6fd'

stashed · Aug 27, 2018 · a228cfd · a228cfd
2 parents b9c2405 + c73f89c
commit a228cfd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/hack/libbuild/concourse/cluster.sh b/hack/libbuild/concourse/cluster.sh
@@ -24,8 +24,12 @@ function cleanup_test_stuff() {
   kubectl get nodes
   kubectl describe nodes
 
+  if [ -d "$BASE_DIR/creds" ]; then
+      rm -rf $BASE_DIR/creds
+  fi
+
   pushd $GOPATH/src/github.com/$ORG_NAME/$REPO_NAME
-  ./hack/deploy/setup.sh --uninstall --purge
+  ./hack/concourse/uninstall.sh
   popd
 
   # delete cluster on exit
@@ -44,15 +48,6 @@ function cleanup_test_stuff() {
     pharmer apply "$NAME"
     pharmer get cluster
   fi
-
-  pushd $GOPATH/src/github.com/$ORG_NAME/$REPO_NAME
-  ./hack/deploy/setup.sh --uninstall --purge
-  popd
-
-  # delete docker image on exit
-  curl -LO https://raw.githubusercontent.com/appscodelabs/libbuild/master/docker.py
-  chmod +x docker.py
-  ./docker.py del_tag $DOCKER_REGISTRY $OPERATOR_NAME $TAG
 }
 trap cleanup_test_stuff EXIT
 

diff --git a/hack/libbuild/concourse/init.sh b/hack/libbuild/concourse/init.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+BASE_DIR=$(pwd)
 GOPATH=$(go env GOPATH)
 REPO_ROOT="$GOPATH/src/github.com/$ORG_NAME/$REPO_NAME"
 PHARMER_VERSION="0.1.0-rc.5"