Enable logs from all-in-one integration test (jaegertracing#1857)

* Enable logs from all-in-one integration test Signed-off-by: Yuri Shkuro <[email protected]> * Bump Node to 10 Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: radekg <[email protected]>
Klarrio · Oct 28, 2019 · 8b3caf6 · 8b3caf6
1 parent e5d26fb
commit 8b3caf6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -84,8 +84,8 @@ clean:
 test: go-gen
 	bash -c "set -e; set -o pipefail; $(GOTEST) ./... | $(COLORIZE)"
 
-.PHONY: integration-test
-integration-test: go-gen
+.PHONY: all-in-one-integration-test
+all-in-one-integration-test: go-gen
 	$(GOTEST) -tags=integration ./cmd/all-in-one/...
 
 .PHONY: storage-integration-test

diff --git a/cmd/all-in-one/all_in_one_test.go b/cmd/all-in-one/all_in_one_test.go
@@ -120,11 +120,14 @@ func getSamplingStrategy(t *testing.T) {
 }
 
 func healthCheck() error {
-	for i := 0; i < 100; i++ {
+	println("Health-checking all-in-one...")
+	for i := 0; i < 10; i++ {
 		if _, err := http.Get(queryURL); err == nil {
+			println("Health-check successful")
 			return nil
 		}
-		time.Sleep(100 * time.Millisecond)
+		println("Health-check unsuccessful, waiting 1sec...")
+		time.Sleep(time.Second)
 	}
 	return fmt.Errorf("query service is not ready")
 }
diff --git a/scripts/travis/build-all-in-one-image.sh b/scripts/travis/build-all-in-one-image.sh
@@ -5,21 +5,27 @@ set -e
 BRANCH=${BRANCH:?'missing BRANCH env var'}
 
 source ~/.nvm/nvm.sh
-nvm use 8
-make build-all-in-one-linux
+nvm use 10
+make build-ui
 
-export REPO=jaegertracing/all-in-one
+set -x
+
+make build-all-in-one GOOS=linux
 
+export REPO=jaegertracing/all-in-one
 docker build -f cmd/all-in-one/Dockerfile -t $REPO:latest cmd/all-in-one
 export CID=$(docker run -d -p 16686:16686 -p 5778:5778 $REPO:latest)
-make integration-test
+
+set +e
+make all-in-one-integration-test
 
 if [ $? -ne 0 ] ; then
     echo "---- integration test failed unexpectedly ----"
     echo "--- check the docker log below for details ---"
     docker logs $CID
     exit 1
 fi
+set -e
 
 docker kill $CID
 

diff --git a/scripts/travis/install-ui-deps.sh b/scripts/travis/install-ui-deps.sh
@@ -3,11 +3,11 @@
 set -e
 
 # Repo for newer Node.js versions
-curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
 
 curl -o- -L https://yarnpkg.com/install.sh | bash
 
 source ~/.nvm/nvm.sh
-nvm install 8
+nvm install 10
 
 yarn --version