[preview] pass context to rollout status, fix regression

Author: vulkoingim

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

@@ -58,29 +58,42 @@ jobs:
                   SLACK_WEBHOOK: ${{ secrets.IDE_SLACK_WEBHOOK }}
                   SLACK_COLOR: ${{ job.status }}
                   SLACK_MESSAGE: main branch build failed
-    check:
-        name: Check for regressions
-        needs: [configuration]
-        runs-on: [self-hosted]
-        container:
-            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
+
+    infrastructure:
+        name: Create preview environment infrastructure
+        needs: [ configuration ]
+        runs-on: [ self-hosted ]
+        concurrency:
+            group: ${{ github.head_ref || github.ref_name }}-infrastructure
         steps:
             - uses: actions/checkout@v3
             - name: Create preview environment infrastructure
+              id: create
               uses: ./.github/actions/preview-create
               with:
                   name: ${{ needs.configuration.outputs.name }}
+                  sa_key: ${{ secrets.GCP_CREDENTIALS }}
                   infrastructure_provider: harvester
                   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}}
+
+    check:
+        name: Check for regressions
+        needs: [configuration, infrastructure]
+        runs-on: [self-hosted]
+        container:
+            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
+            volumes:
+              - /var/tmp:/var/tmp
+              - /tmp:/tmp
+        steps:
+            - uses: actions/checkout@v3
             - name: Integration Test
               shell: bash
               env:
@@ -153,9 +166,16 @@ jobs:
                   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 }}
-                  sa_key: ${{ secrets.GCP_CREDENTIALS }}
+
+    delete:
+      name: Delete preview environment
+      needs: [ configuration, infrastructure, check ]
+      if: github.event.inputs.skip_delete != 'true' && always()
+      runs-on: [ self-hosted ]
+      steps:
+        - uses: actions/checkout@v3
+        - name: Delete preview environment
+          uses: ./.github/actions/delete-preview
+          with:
+            name: ${{ needs.configuration.outputs.name }}
+            sa_key: ${{ secrets.GCP_CREDENTIALS }}

.github/workflows/preview-env-check-regressions.yml

@@ -16,6 +16,7 @@ on:
                 description: "The infrastructure provider to use. Valid options: harvester, gcp"
                 required: false
                 default: harvester
+
 jobs:
     configuration:
         name: Configuration
@@ -46,29 +47,43 @@ jobs:
                           echo "skip=${{ github.event.workflow_run.conclusion == 'failure' }}"
                       } >> $GITHUB_OUTPUT
                   fi
-    check:
-        name: Check for regressions
-        needs: [configuration]
-        if: ${{ needs.configuration.outputs.skip == 'false' }}
-        runs-on: [self-hosted]
-        container:
-            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
+
+    infrastructure:
+        name: Create preview environment infrastructure
+        needs: [ configuration ]
+        runs-on: [ self-hosted ]
+        concurrency:
+            group: ${{ github.head_ref || github.ref_name }}-infrastructure
         steps:
             - uses: actions/checkout@v3
             - name: Create preview environment infrastructure
+              id: create
               uses: ./.github/actions/preview-create
               with:
                   name: ${{ needs.configuration.outputs.name }}
+                  sa_key: ${{ secrets.GCP_CREDENTIALS }}
                   infrastructure_provider: ${{ needs.configuration.outputs.infrastructure_provider }}
                   large_vm: false
-                  sa_key: ${{ secrets.GCP_CREDENTIALS }}
             - name: Deploy Gitpod to the preview environment
               id: deploy-gitpod
               uses: ./.github/actions/deploy-gitpod
               with:
                   name: ${{ needs.configuration.outputs.name }}
                   sa_key: ${{ secrets.GCP_CREDENTIALS }}
                   version: ${{ needs.configuration.outputs.version}}
+
+    check:
+        name: Check for regressions
+        needs: [configuration, infrastructue]
+        if: ${{ needs.configuration.outputs.skip == 'false' }}
+        runs-on: [self-hosted]
+        container:
+            image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
+            volumes:
+                - /var/tmp:/var/tmp
+                - /tmp:/tmp
+        steps:
+            - uses: actions/checkout@v3
             - name: Check
               shell: bash
               env:
@@ -123,11 +138,13 @@ jobs:
                   paths: "test/tests/**/TEST.xml"
               if: always()
             - id: auth
+              if: failure()
               uses: google-github-actions/auth@v1
               with:
                   token_format: access_token
                   credentials_json: "${{ secrets.GCP_CREDENTIALS }}"
             - name: Get Secrets from GCP
+              if: failure()
               id: 'secrets'
               uses: 'google-github-actions/get-secretmanager-secrets@v1'
               with:
@@ -140,8 +157,15 @@ jobs:
                   SLACK_WEBHOOK: '${{ steps.secrets.outputs.devx-slack-webhook }}'
                   SLACK_COLOR: ${{ job.status }}
                   SLACK_MESSAGE: "`${{ needs.configuration.outputs.version}}` smoke test failed"
+
+    delete:
+        name: Delete preview environment
+        needs: [ configuration, infrastructure, check ]
+        if: always()
+        runs-on: [ self-hosted ]
+        steps:
+            - uses: actions/checkout@v3
             - name: Delete preview environment
-              if: always()
               uses: ./.github/actions/delete-preview
               with:
                   name: ${{ needs.configuration.outputs.name }}

dev/preview/workflow/preview/deploy-gitpod.sh

@@ -617,7 +617,7 @@ rm -f "${INSTALLER_RENDER_PATH}"
 # Wait for objects to be ready
 # =========================
 for item in deployment.apps/blobserve deployment.apps/content-service deployment.apps/dashboard deployment.apps/ide-metrics deployment.apps/ide-proxy deployment.apps/ide-service deployment.apps/image-builder-mk3 deployment.apps/minio deployment.apps/node-labeler deployment.apps/payment-endpoint deployment.apps/proxy deployment.apps/public-api-server deployment.apps/redis deployment.apps/server deployment.apps/spicedb deployment.apps/usage deployment.apps/ws-manager deployment.apps/ws-manager-bridge deployment.apps/ws-proxy statefulset.apps/messagebus statefulset.apps/mysql statefulset.apps/openvsx-proxy daemonset.apps/agent-smith daemonset.apps/fluent-bit daemonset.apps/registry-facade daemonset.apps/ws-daemon; do
-  kubectl rollout status "${item}"
+  kubectl --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" --context "${PREVIEW_K3S_KUBE_CONTEXT}" rollout status "${item}"
 done
 
 # =====================