Simplify logic of get-testresults.sh

.circleci/config.yml

@@ -6,10 +6,7 @@ jobs:
     steps:
       - checkout
       - run: mkdir -p ./test-results/ginkgo
-      - run:
-            command: make eksctl-image
-            environment:
-                TEST_OUTPUT: "true"
+      - run: make eksctl-image
       - store_test_results:
           path: ./test-results
       - store_artifacts:

Makefile

@@ -148,7 +148,7 @@ endif
 .PHONY: eksctl-image
 eksctl-image: eksctl-build-image ## Create the eksctl image
 	@docker build --tag=$(EKSCTL_IMAGE) $(EKSCTL_IMAGE_BUILD_ARGS) .
-	./get-testresults.sh
+	@[ -z "${CI}" ] || ./get-testresults.sh # only get test results in Continious Integration
 
 ##@ Release
 

get-testresults.sh

@@ -1,13 +1,8 @@
 #!/bin/sh -ex
 
-if [ -n "${TEST_OUTPUT}" ]; then
-
 BUILDID="$(docker images --filter "label=eksctl.builder=true" --format '{{.ID}}')"
 mkdir -p ${PWD}/test-results/ginkgo
 docker run -i --rm -v ${PWD}/test-results/ginkgo:/mnt/test-results  ${BUILDID}  sh -s <<EOF
 cp /go/src/github.com/weaveworks/eksctl/test-results/ginkgo/*.xml /mnt/test-results
 EOF
 
-else
-    echo "not retrieving test results"
-fi