diff --git a/buildscripts/integrationtest.sh b/buildscripts/integrationtest.sh index b90b6a743b..8208d7c4fe 100755 --- a/buildscripts/integrationtest.sh +++ b/buildscripts/integrationtest.sh @@ -8,6 +8,11 @@ function cleanup { fi } +function cleanupAndExit { + cleanup + rm /test_output/SUCCESS +} + if [[ -z "${CIRCLECI}" ]]; then BUILDOPTS="--force-rm" fi @@ -17,7 +22,8 @@ set -x cleanup +docker-compose -f development.yml config docker-compose -f development.yml build ${BUILDOPTS} --pull | tee docker-compose -f development.yml up --abort-on-container-exit -trap cleanup SIGINT SIGTERM EXIT +trap cleanupAndExit SIGINT SIGTERM EXIT diff --git a/buildscripts/testclient.sh b/buildscripts/testclient.sh index cc244ed0f1..9451c1be89 100755 --- a/buildscripts/testclient.sh +++ b/buildscripts/testclient.sh @@ -44,4 +44,4 @@ bin/notary ${OPTS} delegation add ${REPONAME} targets/releases fixtures/secure.e bin/notary ${OPTS} add ${REPONAME} readmetarget README.md bin/notary ${OPTS} publish ${REPONAME} bin/notary ${OPTS} delegation list ${REPONAME} | grep targets/releases -cat README.md | bin/notary ${OPTS} verify $REPONAME readmetarget > /dev/null +cat README.md | bin/notary ${OPTS} verify $REPONAME readmetarget > /test_output/SUCCESS diff --git a/development.yml b/development.yml index 3aada92e5d..a34c50432a 100644 --- a/development.yml +++ b/development.yml @@ -27,6 +27,8 @@ mysql: - MYSQL_ALLOW_EMPTY_PASSWORD="true" command: mysqld --innodb_file_per_table client: + volumes: + - ./test_output:/test_output build: . dockerfile: Dockerfile links: