From fc471b0aaa5563203ebc21762a77987e72757984 Mon Sep 17 00:00:00 2001 From: Ryan Clark Date: Tue, 26 Jul 2016 18:40:22 -0700 Subject: [PATCH] ci debugging --- circle.yml | 5 +++++ test/test.sh | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/circle.yml b/circle.yml index 98d0bbd..3e5beca 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,8 @@ machine: services: - docker +test: + pre: + - git config --global user.email "devnull@mapbox.com" + - git config --global user.name "circleci" + - export TMPDIR=$(mktemp -d) diff --git a/test/test.sh b/test/test.sh index c05f5ff..06b62d3 100755 --- a/test/test.sh +++ b/test/test.sh @@ -372,7 +372,9 @@ fi assert "equal" "${FAILURE}" "" "should not have any failures" tag_test "build image" -assert success "$(which docker) build -t ecs-conex ./ --no-cache" "built image" +echo "docker version: $($(which docker) --version)" +echo "build command: $(which docker) build --no-cache -t ecs-conex ./" +assert success "$(which docker) build --no-cache -t ecs-conex ./" "built image" # restore stashed AWS vars for integration test export AWS_ACCESS_KEY_ID=${stashedAccessKey} @@ -390,11 +392,11 @@ cwd=$(pwd) && cd ${local_repo} # push an empty commit to a random branch branch=$(node -e "console.log(require('crypto').randomBytes(8).toString('hex'))") -$git checkout -b ${branch} > /dev/null 2>&1 -before=$($git rev-parse head) -$git commit -m "integration test" --allow-empty > /dev/null 2>&1 -after=$($git rev-parse head) -$git push --set-upstream origin ${branch} > /dev/null 2>&1 +$git checkout -b ${branch} +before=$($git rev-parse HEAD) +$git commit -m "integration test" --allow-empty +after=$($git rev-parse HEAD) +$git push --set-upstream origin ${branch} # Ask ecs-conex to build the commit that was made cd ${cwd}