From 75b8fc434b07b5e09759710a130a9dec7c18defc Mon Sep 17 00:00:00 2001
From: Chao Dai <chaodai@google.com>
Date: Fri, 22 Mar 2019 15:29:50 -0700
Subject: [PATCH] Temporarily start knative serving for testing purpose

---
 test/e2e-tests.sh                                       | 3 +++
 test/e2e/config.yaml                                    | 6 +++---
 test/e2e/sampleapptestbase.go                           | 1 +
 vendor/github.com/knative/test-infra/scripts/library.sh | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index 78d0ea77c..41d23a958 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -24,6 +24,9 @@ function knative_setup() {
 
 initialize $@
 
+# Temporarily added for testing purpose
+knative_setup || fail_test
+
 go_test_e2e ./test/e2e || fail_test
 
 success
diff --git a/test/e2e/config.yaml b/test/e2e/config.yaml
index 653555dcd..068bd102d 100644
--- a/test/e2e/config.yaml
+++ b/test/e2e/config.yaml
@@ -3,11 +3,11 @@ languages:
     expectedOutput: "Hello Spring Boot Sample v1!"
     preCommands:
       - exec: "curl"
-        args: "https://start.spring.io/starter.zip -d dependencies=web -d name=helloworld -d artifactId=helloworld -o helloworld.zip"
+        args: "https://start.spring.io/starter.zip -d dependencies=web -d name=helloworld -d artifactId=helloworld -o helloworld-java.zip"
       - exec: "unzip"
-        args: "helloworld.zip -d helloworld-java_tmp"
+        args: "helloworld-java.zip -d helloworld-java_tmp"
       - exec: "rm"
-        args: "helloworld.zip"
+        args: "helloworld-java.zip"
     copies:
       - "/src/main/java/com/example/helloworld/HelloworldApplication.java"
       - "service.yaml"
diff --git a/test/e2e/sampleapptestbase.go b/test/e2e/sampleapptestbase.go
index a31ed5c8d..b6c053a05 100644
--- a/test/e2e/sampleapptestbase.go
+++ b/test/e2e/sampleapptestbase.go
@@ -174,6 +174,7 @@ func checkDeployment(t *testing.T, appName, expectedOutput string) {
 
 // SampleAppTestBase tests individual sample app
 func SampleAppTestBase(t *testing.T, lc languageConfig, expectedOutput string) {
+	t.Parallel()
 	imagePath := ImagePath(lc.AppName)
 	yamlFilePath := path.Join(lc.WorkDir, "service.yaml")
 
diff --git a/vendor/github.com/knative/test-infra/scripts/library.sh b/vendor/github.com/knative/test-infra/scripts/library.sh
index 0508bffb4..80f944aea 100755
--- a/vendor/github.com/knative/test-infra/scripts/library.sh
+++ b/vendor/github.com/knative/test-infra/scripts/library.sh
@@ -271,14 +271,14 @@ function start_latest_knative_serving() {
   kubectl apply -f ${KNATIVE_ISTIO_YAML} || return 1
   wait_until_pods_running istio-system || return 1
   kubectl label namespace default istio-injection=enabled || return 1
-  subheader "Installing Knative Build"
-  echo "Installing Build from ${KNATIVE_BUILD_RELEASE}"
-  kubectl apply -f ${KNATIVE_BUILD_RELEASE} || return 1
+  # subheader "Installing Knative Build"
+  # echo "Installing Build from ${KNATIVE_BUILD_RELEASE}"
+  # kubectl apply -f ${KNATIVE_BUILD_RELEASE} || return 1
   subheader "Installing Knative Serving"
   echo "Installing Serving from ${KNATIVE_SERVING_RELEASE}"
   kubectl apply -f ${KNATIVE_SERVING_RELEASE} || return 1
   wait_until_pods_running knative-serving || return 1
-  wait_until_pods_running knative-build || return 1
+  # wait_until_pods_running knative-build || return 1
 }
 
 # Install the latest stable Knative/build in the current cluster.