Merge branch 'main' into ft/add-xterm-ide

Author: filiptronicek

.github/actions/delete-preview/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
 
 USER root
 ENV OCI_TOOL_VERSION="0.2.0"

.github/actions/deploy-gitpod/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
 
 USER root
 ENV OCI_TOOL_VERSION="0.2.0"

.github/actions/deploy-monitoring-satellite/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
 
 USER root
 ENV OCI_TOOL_VERSION="0.2.0"

.github/actions/preview-create/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
 
 USER root
 ENV OCI_TOOL_VERSION="0.2.0"

.github/workflows/build.yml

@@ -36,6 +36,7 @@ jobs:
       pr_no_diff_skip: ${{ steps.pr-diff.outputs.pr_no_diff_skip }}
       with_werft: ${{ steps.output.outputs.with-werft }}
       with_integration_tests: ${{ steps.output.outputs.with_integration_tests }}
+      latest_ide_version: ${{ contains( steps.pr-details.outputs.pr_body, '[x] latest-ide-version=true') }}
     steps:
       - name: "Determine Branch"
         id: branches
@@ -81,7 +82,7 @@ jobs:
       cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
     runs-on: [ self-hosted ]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
       volumes:
         - /var/tmp:/var/tmp
         - /tmp:/tmp
@@ -149,7 +150,7 @@ jobs:
         ports:
           - 23306:23306
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
       volumes:
         - /var/tmp:/var/tmp
         - /tmp:/tmp
@@ -219,13 +220,26 @@ jobs:
         shell: bash
         working-directory: /workspace/gitpod
         run: |
+          RESULT=0
+          set -x
           leeway build dev:all \
             --docker-build-options network=host \
             --cache remote \
             -Dversion=$VERSION \
             -DlocalAppVersion=$VERSION \
-            -DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev
+            -DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev \
+            --report large-report.html || RESULT=$?
+
+          set +x
 
+          # capture logs for the dev/image build, they're too big for GITHUB_STEP_SUMMARY
+          pup -p -f large-report.html '[id="dev/image:docker"] + details + details' > remove.txt
+
+          # remove logs for the dev/image build output from the report file
+          grep -vxFf  remove.txt large-report.html > report.html
+
+          cat report.html >> $GITHUB_STEP_SUMMARY
+          exit $RESULT
       - name: Leeway Build
         id: leeway
         shell: bash
@@ -278,6 +292,32 @@ jobs:
           path: |
             test-coverage-report
 
+  install-app:
+    runs-on: ubuntu-latest
+    needs: [ configuration, build-gitpod ]
+    if: ${{ needs.configuration.outputs.is_main_branch == 'true' }}
+    steps:
+      - uses: gitpod-io/[email protected]
+        id: auth
+        with:
+          private-key: ${{ secrets.ACTIONS_APP_PKEY }}
+          app-id: 308947
+          installation-id: 35574470
+      - name: trigger installation
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.auth.outputs.token }}
+          script: |
+            const result = await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: 'gitpod-dedicated',
+              workflow_id: 'install-app.yaml',
+              ref: 'main',
+              inputs: {
+                "version": '${{ needs.configuration.outputs.version }}'
+              }
+            })
+
   install:
     name: "Install Gitpod"
     needs: [ configuration, build-previewctl, build-gitpod, infrastructure ]
@@ -321,7 +361,7 @@ jobs:
     needs: [ configuration, build-previewctl, build-gitpod, infrastructure, install ]
     runs-on: [ self-hosted ]
     container:
-        image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+        image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
         volumes:
           - /var/tmp:/var/tmp
           - /tmp:/tmp
@@ -340,6 +380,10 @@ jobs:
             PREVIEW_ENV_DEV_SA_KEY: ${{ secrets.GCP_CREDENTIALS }}
             PREVIEW_NAME: ${{ github.head_ref || github.ref_name }}
             TEST_SUITS: ${{ needs.configuration.outputs.with_integration_tests }}
+            TEST_USE_LATEST_VERSION: ${{ needs.configuration.outputs.latest_ide_version }}
+            TEST_BUILD_ID: ${{ github.run_id }}
+            TEST_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+            TEST_BUILD_REF: ${{ github.head_ref || github.ref }}
         run: |
             set -euo pipefail
 
@@ -358,4 +402,3 @@ jobs:
             previewctl install-context --branch "${PREVIEW_NAME}" --log-level debug --timeout 1m --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}"
 
             $GITHUB_WORKSPACE/test/run.sh -s ${TEST_SUITS}
-

.github/workflows/code-nightly.yml

@@ -31,7 +31,7 @@ jobs:
       - run: |
           gcloud auth configure-docker --quiet
           export LEEWAY_WORKSPACE_ROOT=$(pwd)
-          codeHeadCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/main)
+          codeHeadCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/release/1.77)
           codeVersion=$(curl https://raw.githubusercontent.com/gitpod-io/openvscode-server/$codeHeadCommit/package.json | jq .version)
           cd components/ide/code
           leeway build -Dversion=nightly -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build -DcodeCommit=$codeHeadCommit -DcodeVersion=$codeVersion -DcodeQuality=insider .:docker

.github/workflows/ide-integration-tests.yml

@@ -21,7 +21,7 @@ jobs:
         name: Configuration
         runs-on: [self-hosted]
         container:
-            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
         outputs:
             name: ${{ steps.configuration.outputs.name }}
             version: ${{ steps.configuration.outputs.version }}
@@ -89,7 +89,7 @@ jobs:
         needs: [configuration, infrastructure]
         runs-on: [self-hosted]
         container:
-            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
+            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
             volumes:
               - /var/tmp:/var/tmp
               - /tmp:/tmp

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

@@ -1,4 +1,5 @@
 name: JetBrains Test
+run-name: Test ${{ inputs.jb_product }} (latest=${{ inputs.use_latest }}, build_id=${{ inputs.build_id }})
 on:
   workflow_dispatch:
     inputs:
@@ -14,10 +15,32 @@ on:
         type: string
         description: IDE Endpoint
         required: true
+      jb_product:
+        type: string
+        description: JB product
+        required: true
+      use_latest:
+        type: string
+        description: Use latest IDE version
+        required: true
+      build_id:
+        type: string
+        description: Build ID
+        required: true
+      build_url:
+        type: string
+        description: Build URL
+        required: true
 jobs:
   jetbrains-smoke-test-linux:
     runs-on: ubuntu-latest
     steps:
+      - name: Generate Summary
+        if: always()
+        run: |
+          echo "- Build URL: ${{ inputs.build_url }}" >> $GITHUB_STEP_SUMMARY
+          echo "- JB Product: ${{ inputs.jb_product }}" >> $GITHUB_STEP_SUMMARY
+          echo "- Latest Version: ${{ inputs.use_latest }}" >> $GITHUB_STEP_SUMMARY
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
@@ -45,8 +68,14 @@ jobs:
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
       - name: Get leeway cache version
+        env:
+          TEST_USE_LATEST: ${{ inputs.use_latest }}
         run: |
-          leeway collect | grep components/ide/jetbrains/gateway-plugin:publish-latest > gateway.version
+          if [ $TEST_USE_LATEST = "false" ]; then
+            leeway collect | grep components/ide/jetbrains/gateway-plugin:publish-stable > gateway.version
+          else
+            leeway collect | grep components/ide/jetbrains/gateway-plugin:publish-latest > gateway.version
+          fi
       - name: Cache leeway build
         id: cache-npm
         uses: actions/cache@v3
@@ -59,18 +88,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: |

.github/workflows/jetbrains-update-plugin-platform-template.yml

@@ -44,20 +44,29 @@ jobs:
               run: |
                 URL="https://data.services.jetbrains.com/products/releases?code=${{ inputs.productCode }}&type=${{ inputs.productType }}&platform=linux"
                 echo "URL: $URL"
-                BUILD=$(curl -s "$URL" |jq -r ".${{ inputs.productCode }}[0].build")
+                RELEASE=$(curl -s "$URL" |jq ".${{ inputs.productCode }}[0]")
+                MAJOR_VERSION=$(echo $RELEASE |jq -r ".majorVersion")
+                echo "MAJOR_VERSION: $MAJOR_VERSION"
+
+                BUILD=$(echo $RELEASE |jq -r ".build")
                 echo "BUILD: $BUILD"
                 MAJOR=$(cut -d. -f1 <<< $BUILD)
                 echo "MAJOR: $MAJOR"
                 MINOR=$(cut -d. -f2 <<< $BUILD)
                 echo "MINOR: $MINOR"
                 LATEST_VERSION="$MAJOR.$MINOR-EAP-CANDIDATE-SNAPSHOT"
                 echo "Latest platform version: $LATEST_VERSION"
+
+                echo "::set-output name=sinceBuild::$MAJOR.$MINOR"
+                echo "::set-output name=untilBuild::$MAJOR.*"
+                echo "::set-output name=majorVersion::$MAJOR_VERSION"
                 echo "::set-output name=result::$LATEST_VERSION"
             - name: Update ${{ inputs.gradlePropertiesPath }}
               if: ${{ steps.latest-version.outputs.result != steps.current-version.outputs.result }}
               run: |
-                  PLUGIN_SINCE_BUILD=$(echo "${{ steps.latest-version.outputs.result }}" | sed 's/-EAP-CANDIDATE-SNAPSHOT//' | sed 's/-CUSTOM-SNAPSHOT//')
-                  sed -i "s/pluginSinceBuild=.*/pluginSinceBuild=$PLUGIN_SINCE_BUILD/" ${{ inputs.gradlePropertiesPath }}
+                  sed -i "s/pluginSinceBuild=.*/pluginSinceBuild=${{ steps.latest-version.outputs.sinceBuild }}/" ${{ inputs.gradlePropertiesPath }}
+                  sed -i "s/pluginUntilBuild=.*/pluginUntilBuild=${{ steps.latest-version.outputs.untilBuild }}/" ${{ inputs.gradlePropertiesPath }}
+                  sed -i "s/pluginVerifierIdeVersions=.*/pluginVerifierIdeVersions=${{ steps.latest-version.outputs.majorVersion }}/" ${{ inputs.gradlePropertiesPath }}
                   sed -i 's/platformVersion=${{ steps.current-version.outputs.result }}/platformVersion=${{ steps.latest-version.outputs.result }}/' ${{ inputs.gradlePropertiesPath }}
                   git diff
             - name: Create Pull Request for Gateway Plugin
@@ -71,24 +80,32 @@ jobs:
                       This PR updates the Platform Version from ${{ inputs.pluginName }} to the latest version.
 
                       ## How to test
+
+                      Merge if tests are green, if something breaks then add tests for regressions.
+
+                      <details>
+                      <summary>if you want to test manually for some reasons</summary>
+
                       1. Ensure you have the Gateway installed from [JetBrains Toolbox App](https://www.jetbrains.com/toolbox-app/) and have it up-to-date.
                         - You should use Gateway version corresponding to plugin qualifier, i.e. for stable plugin test with released, for latest test with EAP.
                         - It could be that a new Gateway is not published for the given SDK yet then wait for it to be published. You can check the build version in the About dialog.
                       2. Download the plugin build related to this branch in [Dev Versions](https://plugins.jetbrains.com/plugin/18438-gitpod-gateway/versions/dev), and [install it on the Gateway](https://www.jetbrains.com/help/idea/managing-plugins.html#install_plugin_from_disk).
                         - You can also uninstall current Gitpod plugin, configure dev channel using https://plugins.jetbrains.com/plugins/list?channel=dev&pluginId=18438-gitpod-gateway and restart GW to test that the proper version is detected and installed.
                       3. Create a new workspace from the Gateway (it's ok to use the pre-selected IDE and Repository) and confirm if JetBrains Client can connect to it.
+                      </details>
 
                       ## Release Notes
                       ```release-note
                       NONE
                       ```
 
                       ## Werft options:
-                      - [ ] /werft with-preview
-                      - [ ] /werft with-large-vm
-                      - [x] /werft with-integration-tests=jetbrains
                       - [x] /werft publish-to-jb-marketplace
-                      - [x] /werft with-werft
+                      - [x] /werft with-preview
+                      - [x] /werft with-large-vm
+                      - [x] /werft with-gce-vm
+                      - [x] with-integration-tests=jetbrains
+                      - [x] latest-ide-version=${{ contains(inputs.pluginId, 'latest') }}
 
                       _This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-update-plugin-platform-template.yml) template._
                   commit-message: "Update Platform Version of ${{ inputs.pluginName }} to ${{ steps.latest-version.outputs.result }}"
@@ -114,11 +131,17 @@ jobs:
                       This PR updates the Platform Version from ${{ inputs.pluginName }} to the latest version.
 
                       ## How to test
+
+                      Merge if tests are green, if something breaks then add tests for regressions.
+
+                      <details>
+                      <summary>if you want to test manually for some reasons</summary>
                       1. Open the preview environment generated for this branch
                       2. Choose the _Latest Release (Unstable)_ version of IntelliJ IDEA as your preferred editor
                       3. Start a workspace using this repository: https://github.com/gitpod-samples/spring-petclinic
                       4. Verify that the workspace starts successfully
                       5. Verify that the IDE opens successfully
+                      </details>
 
                       ## Release Notes
                       ```release-note
@@ -128,8 +151,9 @@ jobs:
                       ## Werft options:
                       - [x] /werft with-preview
                       - [x] /werft with-large-vm
-                      - [x] /werft with-integration-tests=jetbrains
-                      - [x] /werft with-werft
+                      - [x] /werft with-gce-vm
+                      - [x] with-integration-tests=jetbrains
+                      - [x] latest-ide-version=${{ contains(inputs.pluginId, 'latest') }}
 
                       _This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-update-plugin-platform-template.yml) template._
                   commit-message: "Update Platform Version of ${{ inputs.pluginName }} to ${{ steps.latest-version.outputs.result }}"

.github/workflows/jetbrains-updates.yml

@@ -32,18 +32,25 @@ jobs:
                       This PR updates the JetBrains IDE images to the most recent `stable` version.
 
                       ## How to test
+
+                      Merge if tests are green, if something breaks then add tests for regressions.
+
+                      <details>
+                      <summary>if you want to test manually for some reasons</summary>
+
                       1. For each IDE changed on this PR, follow these steps:
-                      1. Open the preview environment generated for this branch
-                      1. Choose the stable version of the IDE that you're testing as your default editor
-                      1. Start a workspace using any repository (e.g: `https://github.com/gitpod-io/empty`)
-                      1. Verify that the workspace starts successfully
-                      1. Verify that the IDE opens successfully
-                      1. Verify that the version of the IDE corresponds to the one being updated in this PR
+                      2. Open the preview environment generated for this branch
+                      3. Choose the stable version of the IDE that you're testing as your default editor
+                      4. Start a workspace using any repository (e.g: `https://github.com/gitpod-io/empty`)
+                      5. Verify that the workspace starts successfully
+                      6. Verify that the IDE opens successfully
+                      7. Verify that the version of the IDE corresponds to the one being updated in this PR
 
                       The following resources should help, in case something goes wrong (e.g. workspaces don't start):
 
                       - https://www.gitpod.io/docs/troubleshooting#gitpod-logs-in-jetbrains-gateway
                       - https://docs.google.com/document/d/1K9PSB0G6NwX2Ns_SX_HEgMYTKYsgMJMY2wbh0p6t3lQ
+                      </details>
 
                       ## Release Notes
                       ```release-note
@@ -57,8 +64,9 @@ jobs:
                       -->
                       - [x] /werft with-preview
                       - [x] /werft with-large-vm
-                      - [x] /werft with-integration-tests=jetbrains
-                      - [x] /werft with-werft
+                      - [x] /werft with-gce-vm
+                      - [x] with-integration-tests=jetbrains
+                      - [x] latest-ide-version=false
 
                       _This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-updates.yml) GHA_
                   commit-message: "[JetBrains] Update IDE images to new build version"