[jb] support testing of stable GW

.github/workflows/jetbrains-integration-test.yml

@@ -82,18 +82,25 @@ jobs:
         env:
           DISPLAY: ':10'
           LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE: '8388608'
+          TEST_USE_LATEST: ${{ inputs.use_latest }}
         run: |
           export GATEWAY_LINK=$(jq -r '.inputs.secret_gateway_link' $GITHUB_EVENT_PATH)
           export GITPOD_TEST_ACCESSTOKEN=$(jq -r '.inputs.secret_access_token' $GITHUB_EVENT_PATH)
           export WS_ENDPOINT=$(jq -r '.inputs.secret_endpoint' $GITHUB_EVENT_PATH)
 
           export LEEWAY_WORKSPACE_ROOT=$(pwd)
 
-          sudo mkdir -p /workspace/.gradle-latest
-          sudo chown -R $(whoami) /workspace
-
-          mkdir -p $HOME/.cache/pluginVerifier-latest
-          leeway run dev/jetbrains-test:test -Dversion=integration-test -DpublishToJBMarketplace=false
+          if [ $TEST_USE_LATEST = "false" ]; then
+            sudo mkdir -p /workspace/.gradle-stable
+            sudo chown -R $(whoami) /workspace
+            mkdir -p $HOME/.cache/pluginVerifier-stable
+            leeway run dev/jetbrains-test:test-stable -Dversion=integration-test -DpublishToJBMarketplace=false
+          else
+            sudo mkdir -p /workspace/.gradle-latest
+            sudo chown -R $(whoami) /workspace
+            mkdir -p $HOME/.cache/pluginVerifier-latest
+            leeway run dev/jetbrains-test:test-latest -Dversion=integration-test -DpublishToJBMarketplace=false
+          fi
       - name: Move video
         if: always()
         run: |

dev/jetbrains-test/BUILD.yaml

@@ -1,13 +1,19 @@
 scripts:
-  - name: test
+  - name: test-stable
+    srcs:
+      - "test.sh"
+    deps:
+      - components/ide/jetbrains/gateway-plugin:publish-stable
+    workdir: origin
+    script: |
+        cp $COMPONENTS_IDE_JETBRAINS_GATEWAY_PLUGIN__PUBLISH_STABLE/build/distributions/gitpod-gateway.zip gitpod-gateway.zip
+        ./test.sh
+  - name: test-latest
+    srcs:
+      - "test.sh"
     deps:
       - components/ide/jetbrains/gateway-plugin:publish-latest
     workdir: origin
     script: |
         cp $COMPONENTS_IDE_JETBRAINS_GATEWAY_PLUGIN__PUBLISH_LATEST/build/distributions/gitpod-gateway.zip gitpod-gateway.zip
-        export GATEWAY_PLUGIN_PATH=$(pwd)/gitpod-gateway.zip
-        mkdir -p ~/.local/share/JetBrains/consentOptions/
-        echo -n "rsch.send.usage.stat:1.1:0:1644945193441" > ~/.local/share/JetBrains/consentOptions/accepted
-        mkdir -p ~/.config/JetBrains/JetBrainsClient/options
-        touch ~/.config/JetBrains/JetBrainsClient/options/ide.general.xml
-        ./gradlew test
+        ./test.sh

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

@@ -23,8 +23,8 @@ class IdeDownloader @JvmOverloads constructor(private val httpClient: OkHttpClie
         }
     }
 
-    fun downloadAndExtractLatestEap(ide: Ide, toDir: Path): Path {
-        val idePackage = downloadIde(ide, toDir)
+    fun downloadAndExtract(ide: Ide, toDir: Path, type: String): Path {
+        val idePackage = downloadIde(ide, toDir, type)
         return extractIde(idePackage, toDir)
     }
 
@@ -43,8 +43,8 @@ class IdeDownloader @JvmOverloads constructor(private val httpClient: OkHttpClie
         }
     }
 
-    private fun downloadIde(ide: Ide, toDir: Path): Path {
-        val ideDownloadLink = getIdeDownloadUrl(ide, httpClient)
+    private fun downloadIde(ide: Ide, toDir: Path, type: String): Path {
+        val ideDownloadLink = getIdeDownloadUrl(ide, httpClient, type)
         val idePackageName = ideDownloadLink.substringAfterLast("/").removeSuffix("/")
         val targetFile = toDir.resolve(idePackageName)
         return downloadFile(ideDownloadLink, targetFile)
@@ -60,13 +60,13 @@ class IdeDownloader @JvmOverloads constructor(private val httpClient: OkHttpClie
         }
     }
 
-    private fun getIdeDownloadUrl(ide: Ide, httpClient: OkHttpClient): String {
+    private fun getIdeDownloadUrl(ide: Ide, httpClient: OkHttpClient, type: String): String {
         return httpClient.newCall(
             Request.Builder().url(
                 "https://data.services.jetbrains.com/products/releases".toHttpUrl()
                     .newBuilder()
                     .addQueryParameter("code", ide.feedsCode)
-                    .addQueryParameter("type", "eap,rc,release")
+                    .addQueryParameter("type", type)
                     .addQueryParameter("platform", getFeedsOsPropertyName())
                     .build()
             ).build()
@@ -84,4 +84,4 @@ class IdeDownloader @JvmOverloads constructor(private val httpClient: OkHttpClie
                 ?.asString ?: error("no suitable ide found")
         }
     }
-}
+}

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

@@ -78,8 +78,11 @@ class GatewayLauncherTest {
         val client = OkHttpClient()
         remoteRobot = RemoteRobot("http://localhost:8082", client)
         val ideDownloader = IdeDownloader(client)
+
+        val useLatest = System.getenv("TEST_USE_LATEST")?.toBoolean() ?: false
+        val type = if (useLatest) "eap,rc,release" else "release"
         gatewayProcess = IdeLauncher.launchIde(
-            ideDownloader.downloadAndExtractLatestEap(Ide.GATEWAY, tmpDir),
+            ideDownloader.downloadAndExtract(Ide.GATEWAY, tmpDir, type),
             mapOf("robot-server.port" to 8082),
             emptyList(),
             listOf(
@@ -100,4 +103,4 @@ class GatewayLauncherTest {
 
 fun RemoteRobot.isAvailable(): Boolean = runCatching {
     callJs<Boolean>("true")
-}.getOrDefault(false)
+}.getOrDefault(false)

dev/jetbrains-test/test.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+GATEWAY_PLUGIN_PATH=$(pwd)/gitpod-gateway.zip
+export GATEWAY_PLUGIN_PATH
+
+mkdir -p ~/.local/share/JetBrains/consentOptions/
+echo -n "rsch.send.usage.stat:1.1:0:1644945193441" > ~/.local/share/JetBrains/consentOptions/accepted
+mkdir -p ~/.config/JetBrains/JetBrainsClient/options
+touch ~/.config/JetBrains/JetBrainsClient/options/ide.general.xml
+./gradlew test