e2e testing scripts clean-up (#359)

Signed-off-by: David Chung <[email protected]>

Author: David Chung

Makefile

@@ -14,11 +14,11 @@ ifeq (${DISABLE_OPTIMIZATION},true)
 	VERSION:="$(VERSION)-noopt"
 endif
 
-.PHONY: clean all fmt vet lint build test vendor-update containers check-docs tutorial-test get-tools
+.PHONY: clean all fmt vet lint build test vendor-update containers check-docs e2e-test get-tools
 .DEFAULT: all
 all: clean fmt vet lint build test binaries
 
-ci: fmt vet lint check-docs coverage tutorial-test
+ci: fmt vet lint check-docs coverage e2e-test
 
 AUTHORS: .mailmap .git/HEAD
 	git log --format='%aN <%aE>' | sort -fu > $@
@@ -50,8 +50,8 @@ build-docker:
 	@docker build ${DOCKER_BUILD_FLAGS} \
 	-t ${DOCKER_IMAGE}:${DOCKER_TAG} \
 	-f ${CURDIR}/dockerfiles/Dockerfile.bundle .
-	@echo "Running tests -- scripts/container-test to verify the binaries"
-	@scripts/container-test
+	@echo "Running tests -- scripts/e2e-test-docker-containers.sh to verify the binaries"
+	@scripts/e2e-test-docker-containers.sh
 ifeq (${DOCKER_PUSH},true)
 	@docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
 ifeq (${DOCKER_TAG_LATEST},true)
@@ -141,9 +141,9 @@ coverage:
 		go test -test.short -race -coverprofile="../../../$$pkg/coverage.txt" $${pkg} || exit 1; \
 	done
 
-tutorial-test: binaries
+e2e-test: binaries
 	@echo "+ $@"
-	./scripts/tutorial-test2
+	./scripts/e2e-test.sh
 
 test-full:
 	@echo "+ $@"

circle.yml

@@ -9,8 +9,7 @@ machine:
     GOVERSION: "1.7"
     GOPATH: "$HOME/.go_workspace"
     WORKDIR: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
-    DOCKER_RM: "false"
-    SKIP_CLEANUP: "true"
+    E2E_CLEANUP: "false"
 
 dependencies:
   pre:

scripts/container-test renamed to scripts/e2e-test-docker-containers.sh

@@ -10,10 +10,10 @@ cd "$HERE/.."
 TEST_DIR=$(pwd)/container-test
 DOCKER_IMAGE="${DOCKER_IMAGE:-infrakit/devbundle}"
 DOCKER_TAG="${DOCKER_TAG:-dev}"
-DOCKER_RM="${DOCKER_RM:-true}"
+E2E_CLEANUP=${E2E_CLEANUP:-true}
 
 cleanup() {
-  if [ "$DOCKER_RM" = "true" ]; then
+  if [ "$E2E_CLEANUP" = "true" ]; then
     echo "cleaning up docker images"
     docker ps -a | grep devbundle | awk '{print $1}' | xargs docker stop
     docker ps -a | grep devbundle | awk '{print $1}' | xargs docker rm
@@ -23,14 +23,19 @@ cleanup() {
 trap cleanup EXIT
 
 # set up the directories
-
-mkdir -p $TEST_DIR/plugins
+plugins=$TEST_DIR/plugins
+mkdir -p $plugins
+rm -rf $plugins/*
 
 configstore=$TEST_DIR/configs
 mkdir -p $configstore
+rm -rf $configstore/*
 
 mkdir -p $TEST_DIR/tutorial
+rm -rf $TEST_DIR/tutorial/*
+
 
+# bind mounts
 volumes="-v $TEST_DIR:/root -v $PWD/docs:/root/docs"
 
 # set the environment variable to use a shorter path so we don't have

scripts/tutorial-start-plugins.json renamed to scripts/e2e-test-plugins.json

@@ -8,21 +8,20 @@ cd "$HERE/.."
 
 export PATH=$PWD/build:$PATH
 
-SKIP_CLEANUP=${SKIP_CLEANUP:-false}
+E2E_CLEANUP=${E2E_CLEANUP:-true}
 
 starterpid="" # pid of the cli plugin starter
 cleanup() {
+  if [ "$E2E_CLEANUP" = "true" ]; then
     pgid=$(ps -o pgid= -p $starterpid)
     echo "Stopping plugin starter utility - $starterpid , pgid=$pgid"
     kill -TERM -$pgid
     echo "Stopping other jobs"
     kill $(jobs -p)
     rm -rf tutorial
+  fi
 }
-
-if [ "$SKIP_CLEANUP" != "true" ]; then
-    trap cleanup EXIT
-fi
+trap cleanup EXIT
 
 # infrakit directories
 plugins=~/.infrakit/plugins
@@ -50,7 +49,7 @@ sleep 5  # manager needs to detect leadership
 LOG_DIR=~/.infrakit/logs
 mkdir -p $LOG_DIR
 
-# see the config josn 'tutorial-start-plugins.json' for reference of environment variable TUTORIAL_DIR
+# see the config josn 'e2e-test-plugins.json' for reference of environment variable TUTORIAL_DIR
 TUTORIAL_DIR=~/.infrakit/tutorial
 mkdir -p $TUTORIAL_DIR
 rm -rf $TUTORIAL_DIR/*
@@ -59,7 +58,7 @@ export LOG_DIR=$LOG_DIR
 export TUTORIAL_DIR=$TUTORIAL_DIR
 
 # note -- on exit, this won't clean up the plugins started by the cli since they will be in a separate process group
-infrakit plugin start --wait --config-url file:///$PWD/scripts/tutorial-start-plugins.json --os group-default instance-file flavor-vanilla &
+infrakit plugin start --wait --config-url file:///$PWD/scripts/e2e-test-plugins.json --os group-default instance-file flavor-vanilla &
 
 starterpid=$!
 echo "plugin start pid=$starterpid"