Improve IDE integration test process

Author: iQQBot

.github/CODEOWNERS

@@ -76,6 +76,7 @@
 /operations/observability/mixins/cross-teams @gitpod-io/engineering-workspace @gitpod-io/engineering-webapp @gitpod-io/engineering-ide @gitpod-io/platform
 /.werft/observability @gitpod-io/platform
 /.werft/delete-preview-environments @gitpod-io/platform
+/.werft/ide @gitpod-io/engineering-ide
 
 #
 # Automation

.werft/integration-tests-startup.yaml renamed to .werft/ide/integration-tests-startup.yaml

@@ -36,7 +36,7 @@ pod:
       function cleanup ()
       {
         werft log phase "cleanup preview environment" "cleanup preview environment"
-        BUILD_ID=$(werft run github -a namespace=staging-gitpod-test-main -j .werft/wipe-devstaging.yaml github.com/gitpod-io/gitpod:main)
+        BUILD_ID=$(werft run github -a namespace=staging-gitpod-test-main --remote-job-path .werft/wipe-devstaging.yaml github.com/gitpod-io/gitpod:main)
 
         echo "start cleanup preview environment, job name: ${BUILD_ID}" | werft log slice "cleanup"
         werft log result -d "cleanup job" url "https://werft.gitpod-dev.com/job/${BUILD_ID}"
@@ -45,17 +45,18 @@ pod:
       }
 
       echo "preparing config." | werft log slice prepare
+      sudo chown -R gitpod:gitpod /workspace
       gcloud auth activate-service-account --key-file /mnt/secrets/gcp-sa/service-account.json
       export GOOGLE_APPLICATION_CREDENTIALS="/home/gitpod/.config/gcloud/legacy_credentials/[email protected]/adc.json"
-      export DOCKER_HOST=tcp://$NODENAME:2375
       echo "copied config..." | werft log slice prepare
+      go install github.com/csweichel/oci-tool@latest 2>&1 | werft log slice prepare
       werft log slice prepare --done
 
       werft log phase "build preview environment" "build preview environment"
       # this is because we don't want to increate gitpod-build-main number, we can choose a name
-      sudo cp .werft/build.yaml .werft/test.yaml
+      cp .werft/build.yaml .werft/test.yaml
       # version is actual namespace that werft is build, --job-file should be same with above
-      VERSION=$(werft run github -j .werft/test.yaml -s .werft/test.yaml github.com/gitpod-io/gitpod:main)
+      VERSION=$(werft run github -j .werft/test.yaml -a version=gitpod-test-main github.com/gitpod-io/gitpod:main)
       echo "start build preview environment, job name: ${VERSION}, this will take long time" | werft log slice "build test environment"
       werft log result -d "build job" url "https://werft.gitpod-dev.com/job/${VERSION}"
 
@@ -72,12 +73,14 @@ pod:
 
       werft log phase "integration test" "integration test"
       # we need get integration-test version like: jp-run-integration-test.61
-      INTEGRATION_VERSION=$(docker run eu.gcr.io/gitpod-core-dev/build/versions:${VERSION} cat versions.yaml | yq r - 'components.integrationTest.version')
+
+      oci-tool fetch file eu.gcr.io/gitpod-core-dev/build/versions:gitpod-test-main versions.yaml
+      INTEGRATION_VERSION=$(cat versions.yaml | yq r - 'components.integrationTest.version')
 
       echo "using integration-test image: ${INTEGRATION_VERSION}" | werft log slice "test"
 
 
-      TEST_BUILD_ID=$(werft run github -a version=${INTEGRATION_VERSION} -a namespace=staging-gitpod-test-main -j .werft/run-integration-tests-ide.yaml -a testPattern=vscode.test github.com/gitpod-io/gitpod:main)
+      TEST_BUILD_ID=$(werft run github -a version=${INTEGRATION_VERSION} -a namespace=staging-gitpod-test-main --remote-job-path .werft/ide/run-integration-tests-ide.yaml -a testPattern=vscode.test github.com/gitpod-io/gitpod:main)
 
       echo "running integration, job name: ${TEST_BUILD_ID}" | werft log slice "test"
       werft log result -d "integration test job" url "https://werft.gitpod-dev.com/job/${TEST_BUILD_ID}"

.werft/run-integration-tests-ide.yaml renamed to .werft/ide/run-integration-tests-ide.yaml

@@ -81,10 +81,9 @@ pod:
     - /bin/bash
     - -c
     - |
-      sleep 1
-      set -Eeuo pipefail
+      set -euo
 
-      printf '{{ toJson . }}' > context.json
+      printf '{{ toJson .Annotations }}' > context.json
 
       echo "[prep] receiving config..."
       export GOOGLE_APPLICATION_CREDENTIALS="/config/gcloud/legacy_credentials/[email protected]/adc.json"
@@ -108,21 +107,22 @@ pod:
       /entrypoint.sh "${args[@]}" 2>&1 | ts "[int-tests] "
 
       RC=${PIPESTATUS[0]}
+      context_name={{ .Name }}
+      context_repo={{ .Repository.Repo }}
+      werftJobUrl="https://werft.gitpod-dev.com/job/${context_name}"
+
       if [ $RC -eq 1 ]; then
-        context_name=$(jq -r '.Name' context.json)
-        context_host=$(jq -r '.Repository.host' context.json)
-        context_owner=$(jq -r '.Repository.owner' context.json)
-        context_repo=$(jq -r '.Repository.repo' context.json)
-        repo="${context_host}/${context_owner}/${context_repo}"
-        title=":X: *IDE integration test failure*\n_Repo:_ ${context_repo}\n_Build:_ ${context_name}";
-        werftJobUrl="https://werft.gitpod-dev.com/job/${context_name}"
+        title=":X: *IDE integration test failure*"
         body="Some IDE integration test failed, please check the werf job logs and fix them"
-        curl -X POST \
-          -H 'Content-type: application/json' \
-          -d "{\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"${title}\"},\"accessory\":{\"type\":\"button\",\"text\":{\"type\":\"plain_text\",\"text\":\"Go to Werft\",\"emoji\":true},\"value\":\"click_me_123\",\"url\":\"${werftJobUrl}\",\"action_id\":\"button-action\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"\`\`\`\\n${body}\\n\`\`\`\"}}]}" \
-          "https://hooks.slack.com/${SLACK_NOTIFICATION_PATH}"
-
         echo "[int-tests|FAIL]"
       else
+        title=":white_check_mark: *IDE integration test success*";
+        body="test success"
         echo "[int-tests|DONE]"
       fi
+      title=$title"\n_Repo:_ ${context_repo}\n_Build:_ ${context_name}\n_TestPattern_: {{ .Annotations.testPattern }}";
+      curl -X POST \
+          -H 'Content-type: application/json' \
+          -d "{\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"${title}\"},\"accessory\":{\"type\":\"button\",\"text\":{\"type\":\"plain_text\",\"text\":\":werft: Go to Werft\",\"emoji\":true},\"value\":\"click_me_123\",\"url\":\"${werftJobUrl}\",\"action_id\":\"button-action\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"\`\`\`\\n${body}\\n\`\`\`\"}}]}" \
+          "https://hooks.slack.com/${SLACK_NOTIFICATION_PATH}"
+      exit $RC

test/tests/ide/jetbrains/gateway_test.go

@@ -82,18 +82,18 @@ func TestJetBrainsGatewayWorkspace(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			t.Logf("connecting to server...")
-			server, err := api.GitpodServer(integration.WithGitpodUser(username))
+			t.Logf("get or create user")
+			_, err = api.CreateUser(username, userToken)
 			if err != nil {
 				t.Fatal(err)
 			}
-			t.Logf("connected to server")
 
-			t.Logf("get or create user")
-			_, err = api.CreateUser(username, userToken)
+			t.Logf("connecting to server...")
+			server, err := api.GitpodServer(integration.WithGitpodUser(username))
 			if err != nil {
 				t.Fatal(err)
 			}
+			t.Logf("connected to server")
 
 			t.Logf("starting workspace")
 			nfo, stopWs, err := integration.LaunchWorkspaceFromContextURL(ctx, "referrer:jetbrains-gateway:"+ideName+"/https://github.com/gitpod-io/spring-petclinic", username, api)