Fortio update (istio#1551)

* Update fortio version + start of makefile fix

* makefile: useful to see the exact command, removing the @

* Adding todo, mostly to try to re-trigger prow

* Use 0.3.1

* Fixing test expected string (changed in 0.3.1)

Makefile

@@ -42,26 +42,26 @@ check:
 	echo 'To be added'
 
 build: setup
-	@bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) //...
+	bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) //...
 
 clean:
 	@bazel clean
 
 test: setup
-	@bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) //...
+	bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) //...
 
 docker:
-	@$(TOP)/security/bin/push-docker ${hub} ${tag} -build-only
-	@$(TOP)/pilot/bin/push-docker ${hub} ${tag} -build-only
-	@$(TOP)/mixer/bin/push-docker ${hub} ${tag} -build-only
+	$(TOP)/security/bin/push-docker ${hub} ${tag} -build-only
+	$(TOP)/pilot/bin/push-docker ${hub} ${tag} -build-only
+	$(TOP)/mixer/bin/push-docker ${hub} ${tag} -build-only
 
 push: checkvars
-	@$(TOP)/bin/push $(HUB) $(TAG)
+	$(TOP)/bin/push $(HUB) $(TAG)
 
 artifacts: docker
 	@echo 'To be added'
 
 pilot/platform/kube/config:
-	@ln -s ~/.kube/config pilot/platform/kube/
+	ln -s ~/.kube/config pilot/platform/kube/
 
 .PHONY: artifacts build checkvars clean docker test setup push

WORKSPACE

@@ -242,7 +242,7 @@ go_repository(
 
 go_repository(
     name = "io_istio_fortio",
-    commit = "0.2.8",
+    commit = "0.3.1",
     importpath = "istio.io/fortio",
 )
 
@@ -1144,4 +1144,3 @@ go_repository(
     commit = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42",  # Aug 17, 2016
     importpath = "github.com/gorilla/context",
 )
-

istio.VERSION

@@ -12,5 +12,5 @@ export ISTIO_NAMESPACE="istio-system"
 export AUTH_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/auth/d10e0c4aa05ca726cae71aa5d033dea4f7bc26e4/artifacts/debs"
 export PILOT_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/pilot/3101ea9d82a5f83b699c2d3245b371a19fa6bef4/artifacts/debs"
 export PROXY_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/proxy/2458e4e27bc588df858711b66de0970183e0cf66/artifacts/debs"
-export FORTIO_HUB="gcr.io/istio-testing"
-export FORTIO_TAG="0.2.7"
+export FORTIO_HUB="docker.io/istio"
+export FORTIO_TAG="0.3.1"

tests/e2e/tests/simple/simple1_test.go

@@ -88,7 +88,7 @@ func TestSimpleIngress(t *testing.T) {
 		_ = resp.Body.Close()
 		bodyStr := string(body)
 		glog.Infof("Attempt %d: reply is\n%s\n---END--", i, bodyStr)
-		needle := "echo debug server on echosrv"
+		needle := "echo debug server up"
 		if !strings.Contains(bodyStr, needle) {
 			glog.Warningf("Not finding expected %s in %s", needle, fhttp.DebugSummary(body, 128))
 			continue
@@ -109,6 +109,7 @@ func TestSvc2Svc(t *testing.T) {
 		t.Fatalf("Unexpected to get %d pods when expecting 2. got %v", len(podList), podList)
 	}
 	// call into the service from each of the pods
+	// TODO: use the fortio 0.3.1 web/api endpoint instead and get JSON results (across this file)
 	for _, pod := range podList {
 		glog.Infof("From pod \"%s\"", pod)
 		_, err := util.Shell("kubectl exec -n %s %s -c echosrv -- /usr/local/bin/fortio load -qps 0 -t 10s http://echosrv.%s:8080/echo", ns, pod, ns)