Merge branch 'main' into aa/enable-gha

Author: vulkoingim

Diff for: .github/CODEOWNERS

@@ -24,7 +24,7 @@
 /components/ide-service @gitpod-io/engineering-ide
 /components/ide-service-api @gitpod-io/engineering-ide
 /components/ide-proxy @gitpod-io/engineering-ide
-/components/image-builder-api @csweichel @geropl
+/components/image-builder-api @gitpod-io/engineering-workspace
 /components/image-builder-bob @gitpod-io/engineering-workspace
 /components/image-builder-mk3 @gitpod-io/engineering-workspace
 /components/installation-telemetry @gitpod-io/engineering-security-infrastructure-and-delivery
@@ -88,7 +88,7 @@
 /components/workspacekit @gitpod-io/engineering-workspace
 /components/ws-daemon-api @aledbf @Furisto
 /components/ws-daemon @gitpod-io/engineering-workspace
-/components/ws-manager-api @aledbf @csweichel @kylos101
+/components/ws-manager-api @gitpod-io/engineering-workspace
 /components/ws-manager-bridge-api @gitpod-io/engineering-webapp
 /components/ws-manager-bridge @gitpod-io/engineering-webapp
 /components/ws-manager @gitpod-io/engineering-workspace

Diff for: .github/actions/deploy-gitpod/entrypoint.sh

@@ -26,13 +26,14 @@ leeway run dev/preview/previewctl:download
 echo "Setting up access to core-dev and harvester"
 previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}"
 
-
 PREVIEW_NAME="$(previewctl get-name --branch "${INPUT_NAME}")"
 export PREVIEW_NAME
 
 for var in WITH_WS_MANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE WITH_SLOW_DATABASE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
   input_var="INPUT_${var}"
-  export GITPOD_${var}=${!input_var}
+  if [[ -n "${!input_var:-}" ]];then
+    export GITPOD_${var}=${!input_var}
+  fi
 done
 
 previewctl install-context --branch "${PREVIEW_NAME}" --log-level debug --timeout 10m --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}"

Diff for: .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/release/1.75)
+          codeHeadCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/main)
           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

Diff for: .github/workflows/ide-integration-tests.yml

@@ -8,24 +8,56 @@ on:
             version:
                 required: true
                 description: "The version of Gitpod to install"
+            skip_deploy:
+                required: false
+                description: "Skip deploy preview environment (debug only)"
+            skip_delete:
+                required: false
+                description: "Skip delete preview environment (debug only)"
+    schedule:
+        - cron: "0 3 * * *"
 jobs:
     configuration:
         name: Configuration
         runs-on: [self-hosted]
+        container:
+            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
         outputs:
             name: ${{ steps.configuration.outputs.name }}
             version: ${{ steps.configuration.outputs.version }}
         steps:
             - name: "Set outputs"
               id: configuration
+              shell: bash
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
-                  if [[ '${{ github.event.inputs.name }}' != '' ]]; then
+                  if [[ '${{ github.event.inputs.name }}' != '' && '${{ github.event.inputs.name }}' != 'latest' ]]; then
                       # The workflow was triggered by workflow_dispatch
                       {
                           echo "version=${{ github.event.inputs.version }}"
                           echo "name=${{ github.event.inputs.name }}"
                       } >> $GITHUB_OUTPUT
+                  else
+                      # others
+                      RUNID=$(gh run list -R gitpod-io/gitpod -b main -w Build --limit 1 --json databaseId --jq .[0].databaseId)
+                      if ! gh run watch "$RUNID" --exit-status -R gitpod-io/gitpod >/dev/null 2>&1; then
+                        echo main branch build is failed, see https://github.com/gitpod-io/gitpod/actions/runs/"$RUNID" for detail | tee -a $GITHUB_STEP_SUMMARY
+                        exit 1
+                      fi
+
+                      {
+                          echo "version=$(gh run view "$RUNID" --log -R gitpod-io/gitpod | grep 'main-gha.[0-9]*' -o | head -n 1)"
+                          echo "name=ide-integration-test-${{ github.run_id }}-${{ github.run_attempt }}"
+                      } >> $GITHUB_OUTPUT
                   fi
+            - name: Slack Notification
+              uses: rtCamp/action-slack-notify@v2
+              if: failure()
+              env:
+                  SLACK_WEBHOOK: ${{ secrets.IDE_SLACK_WEBHOOK }}
+                  SLACK_COLOR: ${{ job.status }}
+                  SLACK_MESSAGE: main branch build failed
     check:
         name: Check for regressions
         needs: [configuration]
@@ -39,25 +71,90 @@ jobs:
               with:
                   name: ${{ needs.configuration.outputs.name }}
                   infrastructure_provider: harvester
-                  large_vm: false
+                  large_vm: true
                   sa_key: ${{ secrets.GCP_CREDENTIALS }}
             - name: Deploy Gitpod to the preview environment
+              if: github.event.inputs.skip_deploy != 'true'
               id: deploy-gitpod
               uses: ./.github/actions/deploy-gitpod
               with:
                   name: ${{ needs.configuration.outputs.name }}
                   sa_key: ${{ secrets.GCP_CREDENTIALS }}
                   version: ${{ needs.configuration.outputs.version}}
-            - name: Check
+            - name: Integration Test
+              shell: bash
               env:
                   ROBOQUAT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   USERNAME: ${{ secrets.IDE_INTEGRATION_TEST_USERNAME }}
-                  USER_TOKEN: $ {{ secrets.IDE_INTEGRATION_TEST_USER_TOKEN }}
+                  USER_TOKEN: ${{ secrets.IDE_INTEGRATION_TEST_USER_TOKEN }}
+                  PREVIEW_ENV_DEV_SA_KEY: ${{ secrets.GCP_CREDENTIALS }}
+                  PREVIEW_NAME: ${{ needs.configuration.outputs.name }}
               run: |
-                  echo "IDE tests would run here. Good luck Pudong 🧡"
-                  sleep 60
-            - name: Delete preview environment
+                  set -euo pipefail
+
+                  export LEEWAY_WORKSPACE_ROOT="$(pwd)"
+                  export HOME="/home/gitpod"
+                  export PREVIEW_ENV_DEV_SA_KEY_PATH="/home/gitpod/.config/gcloud/preview-environment-dev-sa.json"
+
+                  echo "${PREVIEW_ENV_DEV_SA_KEY}" > "${PREVIEW_ENV_DEV_SA_KEY_PATH}"
+                  gcloud auth activate-service-account --key-file "${PREVIEW_ENV_DEV_SA_KEY_PATH}"
+
+                  leeway run dev/preview/previewctl:install
+
+                  echo "Setting up access to core-dev and harvester"
+                  previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}"
+
+                  previewctl install-context --branch "${PREVIEW_NAME}" --log-level debug --timeout 1m --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}"
+
+                  # start integration test
+                  args=()
+                  args+=( "-kubeconfig=/home/gitpod/.kube/config" )
+                  args+=( "-namespace=default" )
+                  [[ "$USERNAME" != "" ]] && args+=( "-username=$USERNAME" )
+                  args+=( "-timeout=60m" )
+
+                  IDE_TESTS_DIR="$GITHUB_WORKSPACE/test/tests/ide"
+                  JETBRAINS_TESTS="$IDE_TESTS_DIR/jetbrains"
+                  VSCODE_TESTS="$IDE_TESTS_DIR/vscode"
+                  SSH_TESTS="$IDE_TESTS_DIR/ssh"
+
+                  go install github.com/jstemmer/go-junit-report/v2@latest
+
+                  FAILURE_COUNT=0
+
+                  IDE_TEST_LIST=("$SSH_TESTS" "$VSCODE_TESTS" "$JETBRAINS_TESTS")
+                  for TEST_PATH in "${IDE_TEST_LIST[@]}"
+                  do
+                      TEST_NAME=$(basename "${TEST_PATH}")
+                      echo "running integration for ${TEST_NAME}"
+
+                      cd "${TEST_PATH}"
+                      set +e
+                      go test -v ./... "${args[@]}" 2>&1 | go-junit-report -subtest-mode=exclude-parents -set-exit-code -out "TEST-${TEST_NAME}.xml" -iocopy
+                      RC=${PIPESTATUS[0]}
+                      set -e
+
+                      if [ "${RC}" -ne "0" ]; then
+                        FAILURE_COUNT=$((FAILURE_COUNT+1))
+                      fi
+                  done
+
+                  exit $FAILURE_COUNT
+            - name: Test Summary
+              id: test_summary
+              uses: test-summary/action@v2
+              with:
+                  paths: "test/tests/**/TEST-*.xml"
               if: always()
+            - name: Slack Notification
+              uses: rtCamp/action-slack-notify@v2
+              if: success() || failure()
+              env:
+                  SLACK_WEBHOOK: ${{ secrets.IDE_SLACK_WEBHOOK }}
+                  SLACK_COLOR: ${{ job.status }}
+                  SLACK_MESSAGE: ${{ steps.test_summary.outputs.passed }}/${{ steps.test_summary.outputs.total }} tests passed
+            - name: Delete preview environment
+              if: github.event.inputs.skip_delete != 'true' && (success() || failure())
               uses: ./.github/actions/delete-preview
               with:
                   name: ${{ needs.configuration.outputs.name }}