WIP

Signed-off-by: JenTing Hsiao <[email protected]>

Author: jenting

test/tests/components/ws-manager/prebuild_test.go

@@ -18,6 +18,7 @@ import (
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/pkg/features"
 
+	"github.com/gitpod-io/gitpod/common-go/log"
 	csapi "github.com/gitpod-io/gitpod/content-service/api"
 	gitpod "github.com/gitpod-io/gitpod/gitpod-protocol"
 	agent "github.com/gitpod-io/gitpod/test/pkg/agent/workspace/api"
@@ -223,7 +224,7 @@ func TestOpenWorkspaceFromPrebuild(t *testing.T) {
 				},
 			}
 
-			ctx, cancel := context.WithTimeout(context.Background(), time.Duration(15*len(tests))*time.Minute)
+			ctx, cancel := context.WithTimeout(context.Background(), time.Duration(10*len(tests))*time.Minute)
 			defer cancel()
 
 			for _, test := range tests {
@@ -238,7 +239,7 @@ func TestOpenWorkspaceFromPrebuild(t *testing.T) {
 						req.Type = wsmanapi.WorkspaceType_PREBUILD
 						req.Spec.Envvars = append(req.Spec.Envvars, &wsmanapi.EnvironmentVariable{
 							Name:  "GITPOD_TASKS",
-							Value: fmt.Sprintf(`[{ "init": %q }]`, initTask),
+							Value: `[{ "init": "echo \"some output\" > someFile; sleep 20; exit 1;" }]`,
 						})
 						req.Spec.FeatureFlags = test.FF
 						req.Spec.Initializer = &csapi.WorkspaceInitializer{
@@ -352,53 +353,60 @@ func TestOpenWorkspaceFromPrebuild(t *testing.T) {
 							checkPrebuildLog = true
 							break
 						}
+						log.Infof("[%d] retry...", i)
 						time.Sleep(6 * time.Second)
 					}
 
 					if !checkPrebuildLog {
-						// somehow, the prebuild log message '🤙 This task ran as a workspace prebuild' does not exists
-						// we fall back to check the the init task message within the /workspace/.gitpod/prebuild-log-* or not
-						t.Logf("cannot found the prebuild message %s in %s, err:%v, exitCode:%d, stdout:%s", prebuildLog, prebuildLogPath, err, resp.ExitCode, resp.Stdout)
-
-						// check the init task message exists
-						var checkInitTaskMsg bool
-						err = rsa.Call("WorkspaceAgent.Exec", &agent.ExecRequest{
-							Dir:     prebuildLogPath,
-							Command: "bash",
-							Args: []string{
-								"-c",
-								fmt.Sprintf("grep %q *", initTask),
-							},
-						}, &resp)
-						if err == nil && resp.ExitCode == 0 && strings.Trim(resp.Stdout, " \t\n") != "" {
-							checkInitTaskMsg = true
-						}
+						t.Fatalf("cannot found the prebuild message %s in %s, err:%v, exitCode:%d, stdout:%s", prebuildLog, prebuildLogPath, err, resp.ExitCode, resp.Stdout)
+					}
 
-						if !checkInitTaskMsg {
-							t.Logf("cannot found the init task message %s in %s, err:%v, exitCode:%d, stdout:%s", initTask, prebuildLogPath, err, resp.ExitCode, resp.Stdout)
-
-							// somehow, the init task message does not exist within the /workspace/.gitpod/prebuild-log-*
-							// we fall back to check the file exists or not
-							var ls agent.ListDirResponse
-							err = rsa.Call("WorkspaceAgent.ListDir", &agent.ListDirRequest{
-								Dir: test.WorkspaceRoot,
-							}, &ls)
-							if err != nil {
-								t.Fatal(err)
+					/*
+						if !checkPrebuildLog {
+							// somehow, the prebuild log message '🤙 This task ran as a workspace prebuild' does not exists
+							// we fall back to check the the init task message within the /workspace/.gitpod/prebuild-log-* or not
+							t.Logf("cannot found the prebuild message %s in %s, err:%v, exitCode:%d, stdout:%s", prebuildLog, prebuildLogPath, err, resp.ExitCode, resp.Stdout)
+
+							// check the init task message exists
+							var checkInitTaskMsg bool
+							err = rsa.Call("WorkspaceAgent.Exec", &agent.ExecRequest{
+								Dir:     prebuildLogPath,
+								Command: "bash",
+								Args: []string{
+									"-c",
+									fmt.Sprintf("grep %q *", initTask),
+								},
+							}, &resp)
+							if err == nil && resp.ExitCode == 0 && strings.Trim(resp.Stdout, " \t\n") != "" {
+								checkInitTaskMsg = true
 							}
 
-							var found bool
-							for _, f := range ls.Files {
-								if filepath.Base(f) == "someFile" {
-									found = true
-									break
+							if !checkInitTaskMsg {
+								t.Logf("cannot found the init task message %s in %s, err:%v, exitCode:%d, stdout:%s", initTask, prebuildLogPath, err, resp.ExitCode, resp.Stdout)
+
+								// somehow, the init task message does not exist within the /workspace/.gitpod/prebuild-log-*
+								// we fall back to check the file exists or not
+								var ls agent.ListDirResponse
+								err = rsa.Call("WorkspaceAgent.ListDir", &agent.ListDirRequest{
+									Dir: test.WorkspaceRoot,
+								}, &ls)
+								if err != nil {
+									t.Fatal(err)
+								}
+
+								var found bool
+								for _, f := range ls.Files {
+									if filepath.Base(f) == "someFile" {
+										found = true
+										break
+									}
+								}
+								if !found {
+									t.Fatal("did not find someFile from previous workspace instance")
 								}
-							}
-							if !found {
-								t.Fatal("did not find someFile from previous workspace instance")
 							}
 						}
-					}
+					*/
 
 					// write file foobar.txt and stop the workspace
 					err = rsa.Call("WorkspaceAgent.WriteFile", &agent.WriteFileRequest{