Skip to content

Commit aae1d67

Browse files
authored
[gha] update IDE github action to default use ws-manager-mk2 (#17595)
* [gh-action] update IDE github action to default use ws-manager-mk2 * [ide-integration-test] add option to use mk2 or not * update regressions check * update build integration test
1 parent 28e3649 commit aae1d67

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ jobs:
414414
TEST_BUILD_ID: ${{ github.run_id }}
415415
TEST_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
416416
TEST_BUILD_REF: ${{ github.head_ref || github.ref }}
417+
WS_MANAGER_MK2: ${{ needs.configuration.outputs.with_ws_manager_mk2 != 'false' }}
417418
run: |
418419
set -euo pipefail
419420

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ on:
88
version:
99
required: true
1010
description: "The version of Gitpod to install"
11+
wsman_mk2:
12+
required: false
13+
type: boolean
14+
default: true
15+
description: "Run tests against ws-manager-mk2"
1116
skip_deploy:
1217
required: false
1318
description: "Skip deploy preview environment (debug only)"
@@ -83,6 +88,7 @@ jobs:
8388
name: ${{ needs.configuration.outputs.name }}
8489
sa_key: ${{ secrets.GCP_CREDENTIALS }}
8590
version: ${{ needs.configuration.outputs.version}}
91+
wsmanager_mk2: ${{ github.event.inputs.wsman_mk2 != 'false' }}
8692

8793
check:
8894
name: Check for regressions
@@ -135,6 +141,8 @@ jobs:
135141
VSCODE_TESTS="$IDE_TESTS_DIR/vscode"
136142
SSH_TESTS="$IDE_TESTS_DIR/ssh"
137143
144+
export WS_MANAGER_MK2="${{ github.event.inputs.wsman_mk2 != 'false' }}"
145+
138146
go install github.com/jstemmer/go-junit-report/v2@latest
139147
140148
FAILURE_COUNT=0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
- [x] /werft with-gce-vm
107107
- [x] with-integration-tests=jetbrains
108108
- [x] latest-ide-version=${{ contains(inputs.pluginId, 'latest') }}
109+
- [x] with-ws-manager-mk2
109110
110111
_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._
111112
commit-message: "Update Platform Version of ${{ inputs.pluginName }} to ${{ steps.latest-version.outputs.result }}"

.github/workflows/jetbrains-updates.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
- [x] /werft with-gce-vm
6868
- [x] with-integration-tests=jetbrains
6969
- [x] latest-ide-version=false
70+
- [x] with-ws-manager-mk2
7071
7172
_This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-updates.yml) GHA_
7273
commit-message: "[JetBrains] Update IDE images to new build version"

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ on:
1515
infrastructure_provider:
1616
description: "The infrastructure provider to use. Valid options: harvester, gcp"
1717
required: false
18-
default: harvester
18+
default: gcp
19+
wsman_mk2:
20+
required: false
21+
type: boolean
22+
default: true
23+
description: "Run tests against ws-manager-mk2"
1924

2025
jobs:
2126
configuration:
@@ -71,6 +76,7 @@ jobs:
7176
name: ${{ needs.configuration.outputs.name }}
7277
sa_key: ${{ secrets.GCP_CREDENTIALS }}
7378
version: ${{ needs.configuration.outputs.version}}
79+
wsmanager_mk2: ${{ github.event.inputs.wsman_mk2 != 'false' }}
7480

7581
check:
7682
name: Check for regressions
@@ -118,6 +124,8 @@ jobs:
118124
119125
TESTS_DIR="$GITHUB_WORKSPACE/test/tests/smoke-test"
120126
127+
export WS_MANAGER_MK2="${{ github.event.inputs.wsman_mk2 != 'false' }}"
128+
121129
go install github.com/jstemmer/go-junit-report/v2@latest
122130
123131
echo "running integration for smoke test"

0 commit comments

Comments
 (0)