set global knuu timeout

Makefile

@@ -119,7 +119,7 @@ test-short:
 ## test-e2e: Run end to end tests via knuu. This command requires a kube/config file to configure kubernetes.
 test-e2e:
 	@echo "--> Running end to end tests"
-	@KNUU_NAMESPACE=test E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 10m -v
+	@KNUU_NAMESPACE=test KNUU_TIMEOUT=20m E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 20m -v
 .PHONY: test-e2e
 
 ## test-race: Run tests in race mode.

test/e2e/simple_test.go

@@ -22,7 +22,6 @@ var latestVersion = "latest"
 // and MsgSends over 30 seconds and then asserts that at least 10 transactions were
 // committed.
 func TestE2ESimple(t *testing.T) {
-	t.Skip()
 	if os.Getenv("E2E") != "true" {
 		t.Skip("skipping e2e test")
 	}

test/e2e/upgrade_test.go

@@ -103,6 +103,7 @@ func TestMinorVersionCompatibility(t *testing.T) {
 		require.NoError(t, err)
 	}
 
+	t.Log("checking that all nodes are at the same height")
 	const maxPermissableDiff = 2
 	for i := 0; i < len(heights); i++ {
 		for j := i + 1; j < len(heights); j++ {