11111111

Author: iQQBot

.github/workflows/jetbrains-auto-update.yml

@@ -56,8 +56,6 @@ jobs:
           export WS_ENDPOINT=$(jq -r '.inputs.secret_endpoint' $GITHUB_EVENT_PATH)
           export GATEWAY_PLUGIN_PATH=$(pwd)/build/gateway-test.zip
 
-          echo "$WS_ENDPOINT ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCybpjrskn0GkkjkxgT/OK108wu1UkCkWVkuvA+TEMtjnyNvwPs7PJZwk1N1Isk7F40/1eF3luTixDcvzTn4R6AAWG2/DRbDJTUoy9bV2MH84bB64SMBLYwRUj60e8zF1GFGtQxolrIO75M61qqAM1vCkpEAuLszKIC7xKkYNIVI1sDXAZDrRjn5MdtFSRpeTCN7mt6EvZVtZKPgzUkSiA507w0IxexSX8OEz1UxidMoTagS8wK+U+VaMWJja6bQ6jqzZ7Ou/uCz0Q99q7hFs0cdAh5Q2KNDG518PB750FoUIxWBsniHtRMh2YLtkrYdHhjRVsmg3ltG78hM3iISCbro4avUo3d7IKL97mLAETKxvAwUTn5pcNzk8jSqo51RlmxWHMgE++xNUeuUirhXTzQHSlCcbKsNcdP9gc2jMOQPAiRmHtzLIuHGGwS85M146PsFy6DG/XZOhu9/DhGVMq51NDKs3X8JHzXVGWxmZqLfM9BM+rojvepZgUa5S1mdwE=" >> ~/.ssh/known_hosts
-          echo "$WS_ENDPOINT ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMaWYf9zrhI79dA9iBi7qF1anYtUCdT9l0xG2w9oNKHezKuSrJb+pFbHPsL/HuBHK8Yx1HJEufE4uIv//WGCOlCIdW4D40aKhEu5WXtpo8zI0SxkuOvaWDRuUbYNb3/oNNo79WNuhXR6mWn5skm6D+J5vv8H7V5tYrsZf6UqYZF5uLkeQFsis0UVm3+jNFVY/PuHbo6ndrh9DFCQF4YhMQpGTAG0PLal4VLJ4L31TOnb3buBtCWcf3CslT8IiqREdFcJE6MjaMVMCgENQHRWQ57vjv0xKxoI/sA1tMMzD8KrZxC+yB7Qwiby/8iAuhb1Zluh8sxH0NBv8fh1zI8rxbwP5pG3MnTxsCKYpBN01hyuFWtruARfrEGtSMZ4z5oMAFl08BuXSq+e1Ty/dEjfxv2EuG6enU0EJezqJLeCLWqVPZw7hncJD74J4H2pHlk9v3/q9EAD83GY++IChChBLK6wQybEVk+Md7n9GxjCiDAowspSTnq5FHPuKRjDpc1s8=" >> ~/.ssh/known_hosts
           mkdir -p ~/Library/Application\ Support/JetBrains/consentOptions
           echo -n "rsch.send.usage.stat:1.1:0:1644945193441" > ~/Library/Application\ Support/JetBrains/consentOptions/accepted
           mkdir -p ~/Library/Application\ Support/JetBrains/JetBrainsClient/options

.werft/integration-tests-startup.yaml

@@ -83,7 +83,7 @@ pod:
       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=ide.test github.com/gitpod-io/gitpod:main)
+      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)
 
       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

@@ -67,6 +67,11 @@ pod:
         secretKeyRef:
           name: integration-test-user
           key: token
+    - name: ROBOQUAT_TOKEN
+      valueFrom:
+        secretKeyRef:
+          name: github-roboquat-automatic-changelog
+          key: token
     command:
     - /bin/bash
     - -c
@@ -76,6 +81,9 @@ pod:
 
       echo "[prep] receiving config..."
       export GOOGLE_APPLICATION_CREDENTIALS="/config/gcloud/legacy_credentials/[email protected]/adc.json"
+
+      printf '{{ toJson .Annotations }}' > context.json
+
       echo "[prep] received config."
 
       echo "[prep] using username: $USERNAME"

dev/jetbrains-test/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.6.10'
 }
 
-group 'org.example'
+group 'io.gitpod'
 version '1.0-SNAPSHOT'
 
 repositories {
@@ -11,14 +11,14 @@ repositories {
 }
 
 test {
-    systemProperty 'video.save.mode', 'ALL'
-    systemProperty 'gateway_link', System.getenv('GATEWAY_LINK')
-    systemProperty 'gateway_plugin_path', System.getenv('GATEWAY_PLUGIN_PATH')
+    systemProperty('video.save.mode', 'ALL')
+    systemProperty('gateway_link', System.getenv('GATEWAY_LINK'))
+    systemProperty('gateway_plugin_path', System.getenv('GATEWAY_PLUGIN_PATH'))
     useJUnitPlatform()
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib"
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
 
     implementation("com.google.code.gson:gson:2.8.9")
     implementation("com.squareup.okhttp3:okhttp:4.9.3")
@@ -29,8 +29,8 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
 
     // Logging Network Calls
-    testImplementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
+    testImplementation('com.squareup.okhttp3:logging-interceptor:4.9.3')
 
     // Video Recording
-    implementation 'com.automation-remarks:video-recorder-junit5:2.0'
+    implementation('com.automation-remarks:video-recorder-junit5:2.0')
 }

dev/jetbrains-test/src/test/kotlin/io/gitpod/jetbrains/launcher/CommandLineProjectTest.kt renamed to dev/jetbrains-test/src/test/kotlin/io/gitpod/jetbrains/launcher/GatewayLauncherTest.kt

@@ -28,7 +28,7 @@ import java.util.*
 import java.util.prefs.Preferences
 
 @Timeout(value = 25, unit = TimeUnit.MINUTES)
-class CommandLineProjectTest {
+class GatewayLauncherTest {
     companion object {
         private var gatewayProcess: Process? = null
         private var tmpDir: Path = Files.createTempDirectory("launcher")
@@ -60,6 +60,7 @@ class CommandLineProjectTest {
     @Test
     @Video
     fun test() {
+        // bypass privacy_policy
         setPreferences("jetbrains.privacy_policy.accepted_version", "999.999")
         setPreferences("jetbrains.privacy_policy.cwmguesteua_accepted_version", "999.999")
         setPreferences("jetbrains.privacy_policy.ij_euaeap_accepted_version", "999.999")
@@ -95,4 +96,8 @@ class CommandLineProjectTest {
         log.atInfo().log("remoteRobot available")
         Thread.sleep(1000 * 120)
     }
-}
+}
+
+fun RemoteRobot.isAvailable(): Boolean = runCatching {
+    callJs<Boolean>("true")
+}.getOrDefault(false)

dev/jetbrains-test/src/test/kotlin/io/gitpod/jetbrains/launcher/RemoteRobotExt.kt

@@ -11,8 +11,10 @@ require (
 	github.com/gitpod-io/gitpod/supervisor/api v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/ws-manager/api v0.0.0-00010101000000-000000000000
 	github.com/go-sql-driver/mysql v1.5.0
+	github.com/google/go-github/v42 v42.0.0
 	github.com/google/uuid v1.2.0
 	github.com/prometheus/procfs v0.7.3
+	golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
@@ -56,6 +58,7 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
@@ -110,11 +113,10 @@ require (
 	go.opencensus.io v0.23.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.8.0 // indirect
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
 	golang.org/x/mod v0.4.2 // indirect
 	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
-	golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1 // indirect
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
 	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect