Merge pull request #8 from SAP/CCFenner/cleanup

cleanup

Author: CCFenner

CONTRIBUTING.md .github/CONTRIBUTING.mdCONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -5,4 +5,4 @@ branches:
 language: minimal
 services:
 - docker
-script: chmod +x runTests.sh && ./runTests.sh
+script: cd test/integration/ && chmod +x runTests.sh && ./runTests.sh

.travis.yml

@@ -16,21 +16,30 @@ set -x
 # Start a local registry, to which we push the images built in this test, and from which they will be consumed in the test
 docker run -d -p 5000:5000 --restart always --name registry registry:2 || true
 
-docker build -t localhost:5000/ppiper/neo-cli .
-docker tag localhost:5000/ppiper/neo-cli ppiper/neo-cli:latest
+docker build \
+  -t localhost:5000/ppiper/neo-cli \
+  -t ppiper/neo-cli:latest \
+  "$(pwd)/../.."
 docker push localhost:5000/ppiper/neo-cli:latest
 
 git clone https://github.com/piper-validation/cloud-s4-sdk-book -b validate-neo-cli test-project
 pushd test-project
 
-docker run -v //var/run/docker.sock:/var/run/docker.sock -v $(pwd):/workspace -v /tmp\
-  -e CX_INFRA_IT_CF_PASSWORD -e CX_INFRA_IT_CF_USERNAME -e BRANCH_NAME=master \
-  -e CASC_JENKINS_CONFIG=/workspace/jenkins.yml -e HOST=$(hostname) \
+docker run \
+  -v //var/run/docker.sock:/var/run/docker.sock \
+  -v "$(pwd):/workspace" \
+  -v /tmp \
+  -e CX_INFRA_IT_CF_PASSWORD \
+  -e CX_INFRA_IT_CF_USERNAME \
+  -e BRANCH_NAME=master \
+  -e CASC_JENKINS_CONFIG=/workspace/jenkins.yml \
+  -e HOST=$(hostname) \
   ppiper/jenkinsfile-runner
 
 popd
 
 function cleanup {
   rm -rf test-project
+  docker rm --force registry
 }
 trap cleanup EXIT