Fix E2E tests TestBaseImageBuild and TestParallelBaseImageBuild

.werft/jobs/build/deploy-to-preview-environment.ts

@@ -78,7 +78,7 @@ export async function deployToPreviewEnvironment(werft: Werft, jobConfig: JobCon
     const domain = withVM ? `${destname}.preview.gitpod-dev.com` : `${destname}.staging.gitpod-dev.com`;
     const monitoringDomain = `${destname}.preview.gitpod-dev.com`;
     const url = `https://${domain}`;
-    const imagePullAuth = exec(`printf "%s" "_json_key:$(kubectl get secret ${IMAGE_PULL_SECRET_NAME} --namespace=keys -o yaml \
+    const imagePullAuth = exec(`printf "%s" "_json_key:$(kubectl --kubeconfig ${CORE_DEV_KUBECONFIG_PATH} get secret ${IMAGE_PULL_SECRET_NAME} --namespace=keys -o yaml \
         | yq r - data['.dockerconfigjson'] \
         | base64 -d)" | base64 -w 0`, { silent: true }).stdout.trim();
 

components/ws-daemon/pkg/dispatch/dispatch.go

@@ -212,7 +212,7 @@ func (d *Dispatch) handlePodUpdate(oldPod, newPod *corev1.Pod) {
 			d.mu.Lock()
 			s := d.ctxs[workspaceInstanceID]
 			if s == nil {
-				log.WithFields(owi).Error("pod disappaered from dispatch state before container was ready")
+				log.WithFields(owi).Error("pod disappeared from dispatch state before container was ready")
 				d.mu.Unlock()
 				return
 			}

test/README.md

@@ -1,6 +1,6 @@
 # Integration Tests
 
-This directory containts Gitpod's integration tests, including the framework that makes them possible.
+This directory contains Gitpod's integration tests, including the framework that makes them possible.
 
 Integration tests work by instrumenting Gitpod's components to modify and verify its state.
 Such tests are for example:
@@ -61,13 +61,13 @@ There are 4 different types of tests:
 To run the tests:
 1. Clone this repo (`git clone [email protected]:gitpod-io/gitpod.git`), and `cd` to `./gitpod/test`
 2. Run the tests like so
-  ```console
-  go test -v ./... \
-  -kubeconfig=<path_to_kube_config_file> \
-  -namespace=<namespace_where_gitpod_is_installed> \
-  -username=<gitpod_user_with_oauth_setup> \
-  -enterprise=<true|false> \
-  -gitlab=<true|false>
-  ```
+   ```console
+   go test -v ./... \
+     -kubeconfig=<path_to_kube_config_file> \
+     -namespace=<namespace_where_gitpod_is_installed> \
+     -username=<gitpod_user_with_oauth_setup> \
+     -enterprise=<true|false> \
+     -gitlab=<true|false>
+   ```
 3. Tests `TestUploadDownloadBlob` and `TestUploadDownloadBlobViaServer` will fail when testing locally, as they are trying to connect to cluster local resources directly. To test them use docker image instead that runs within the cluster.
 4. If you want to run specific test, add `-run <test>` before `-kubeconfig` parameter.

test/pkg/integration/common/port_forward.go

@@ -17,7 +17,7 @@ import (
 
 // ForwardPort establishes a TCP port forwarding to a Kubernetes pod
 // Uses kubectl instead of Go to use a local process that can reproduce the same behavior outside the tests
-// Since we are using kubectl directly we need to pass kubeconfig explicetly
+// Since we are using kubectl directly we need to pass kubeconfig explicitly
 func ForwardPort(ctx context.Context, kubeconfig string, namespace, pod, port string) (readychan chan struct{}, errchan chan error) {
 	errchan = make(chan error, 1)
 	readychan = make(chan struct{}, 1)

test/pkg/integration/workspace.go

@@ -182,18 +182,17 @@ func LaunchWorkspaceDirectly(ctx context.Context, api *ComponentAPI, opts ...Lau
 
 	wsm, err := api.WorkspaceManager()
 	if err != nil {
-		return nil, xerrors.Errorf("cannot start workspace: %q", err)
+		return nil, xerrors.Errorf("cannot start workspace manager: %q", err)
 	}
 
 	sresp, err := wsm.StartWorkspace(sctx, req)
-	scancel()
 	if err != nil {
 		return nil, xerrors.Errorf("cannot start workspace: %q", err)
 	}
 
 	lastStatus, err := WaitForWorkspaceStart(ctx, instanceID.String(), api, options.WaitForOpts...)
 	if err != nil {
-		return nil, xerrors.Errorf("cannot start workspace: %q", err)
+		return nil, xerrors.Errorf("cannot wait for workspace start: %q", err)
 	}
 
 	// it.t.Logf("workspace is running: instanceID=%s", instanceID.String())

test/tests/workspace/mount_proc_test.go

@@ -70,7 +70,7 @@ func TestMountProc(t *testing.T) {
 
 			var wg sync.WaitGroup
 			wg.Add(parallel)
-			for i := 0; i < 5; i++ {
+			for i := 0; i < parallel; i++ {
 				go func() {
 					defer wg.Done()
 					loadMountProc(t, rsa)