Skip to content

Commit c9df6d8

Browse files
geroplona-agent
andcommitted
Remove gce-github-runner usage from all workflows
Replace self-hosted GCE runner pattern with GitHub-hosted ubuntu-latest runners across all workflows. This removes the three-phase pattern (create-runner, use-runner, delete-runner) and simplifies workflow execution. Changes: - Remove create-runner and delete-runner jobs from all workflows - Replace runs-on: ${{ needs.create-runner.outputs.label }} with runs-on: ubuntu-latest - Remove create-runner from job dependencies - Preserve all other job dependencies and concurrency controls Affected workflows: - build.yml (8 jobs) - workspace-integration-tests.yml (4 jobs) - ide-integration-tests.yml (4 jobs) - preview-env-check-regressions.yml (4 jobs) - preview-env-gc.yml (2 jobs) - jetbrains-auto-update-template.yml (1 job) - jetbrains-integration-test.yml (1 job) - code-nightly.yml (1 job) - preview-env-delete.yml (1 job) Co-authored-by: Ona <no-reply@ona.com>
1 parent abac094 commit c9df6d8

9 files changed

+41
-240
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,9 @@ on:
2929
- cron: '0 0 * * *'
3030

3131
jobs:
32-
create-runner:
33-
uses: gitpod-io/gce-github-runner/.github/workflows/create-vm.yml@main
34-
secrets:
35-
runner_token: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_TOKEN }}
36-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
37-
concurrency:
38-
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-create-runner
39-
cancel-in-progress: false
40-
4132
configuration:
4233
name: Configure job parameters
43-
runs-on: ${{ needs.create-runner.outputs.label }}
44-
needs: [ create-runner ]
34+
runs-on: ubuntu-latest
4535
concurrency:
4636
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-configuration
4737
cancel-in-progress: true
@@ -112,11 +102,11 @@ jobs:
112102
(needs.configuration.outputs.pr_no_diff_skip != 'true') &&
113103
(needs.configuration.outputs.preview_enable == 'true') &&
114104
(needs.configuration.outputs.is_scheduled_run != 'true')
115-
needs: [ configuration, create-runner ]
105+
needs: [ configuration ]
116106
concurrency:
117107
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-build-previewctl
118108
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
119-
runs-on: ${{ needs.create-runner.outputs.label }}
109+
runs-on: ubuntu-latest
120110
container:
121111
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
122112
steps:
@@ -135,13 +125,13 @@ jobs:
135125
run: |
136126
leeway build dev/preview/previewctl:cli --cache remote
137127
infrastructure:
138-
needs: [ configuration, build-previewctl, create-runner ]
128+
needs: [ configuration, build-previewctl ]
139129
if: |
140130
(needs.configuration.outputs.pr_no_diff_skip != 'true') &&
141131
(needs.configuration.outputs.preview_enable == 'true') &&
142132
(needs.configuration.outputs.is_main_branch != 'true') &&
143133
(needs.configuration.outputs.is_scheduled_run != 'true')
144-
runs-on: ${{ needs.create-runner.outputs.label }}
134+
runs-on: ubuntu-latest
145135
concurrency:
146136
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-infrastructure
147137
cancel-in-progress: true
@@ -166,8 +156,8 @@ jobs:
166156

167157
build-gitpod:
168158
name: Build Gitpod
169-
needs: [ configuration, create-runner ]
170-
runs-on: ${{ needs.create-runner.outputs.label }}
159+
needs: [ configuration ]
160+
runs-on: ubuntu-latest
171161
outputs:
172162
affected_packages: ${{ steps.check_vulnerabilities.outputs.affected_packages }}
173163
concurrency:
@@ -399,8 +389,8 @@ jobs:
399389
name: vulnerability-reports
400390
path: ${{ steps.scan.outputs.leeway_vulnerability_reports_dir }}
401391
install-app:
402-
runs-on: ${{ needs.create-runner.outputs.label }}
403-
needs: [ configuration, build-gitpod, create-runner ]
392+
runs-on: ubuntu-latest
393+
needs: [ configuration, build-gitpod ]
404394
if: ${{ needs.configuration.outputs.is_main_branch == 'true' && needs.configuration.outputs.is_scheduled_run != 'true' }}
405395
strategy:
406396
fail-fast: false
@@ -439,9 +429,8 @@ jobs:
439429
- build-previewctl
440430
- build-gitpod
441431
- infrastructure
442-
- create-runner
443432
if: needs.configuration.outputs.is_scheduled_run != 'true'
444-
runs-on: ${{ needs.create-runner.outputs.label }}
433+
runs-on: ubuntu-latest
445434
concurrency:
446435
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-install
447436
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
@@ -489,8 +478,8 @@ jobs:
489478
490479
monitoring:
491480
name: "Install Monitoring Satellite"
492-
needs: [ infrastructure, build-previewctl, create-runner ]
493-
runs-on: ${{ needs.create-runner.outputs.label }}
481+
needs: [ infrastructure, build-previewctl ]
482+
runs-on: ubuntu-latest
494483
if: needs.configuration.outputs.with_monitoring == 'true' && needs.configuration.outputs.is_scheduled_run != 'true'
495484
concurrency:
496485
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-monitoring
@@ -518,8 +507,7 @@ jobs:
518507
- build-gitpod
519508
- infrastructure
520509
- install
521-
- create-runner
522-
runs-on: ${{ needs.create-runner.outputs.label }}
510+
runs-on: ubuntu-latest
523511
container:
524512
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
525513
if: needs.configuration.outputs.with_integration_tests != '' && needs.configuration.outputs.is_scheduled_run != 'true'
@@ -551,7 +539,6 @@ jobs:
551539
needs:
552540
- configuration
553541
- build-gitpod
554-
- create-runner
555542
if: needs.configuration.outputs.is_main_branch == 'true' && needs.configuration.outputs.is_scheduled_run != 'true'
556543
uses: ./.github/workflows/workspace-integration-tests.yml
557544
with:
@@ -563,7 +550,6 @@ jobs:
563550
needs:
564551
- configuration
565552
- build-gitpod
566-
- create-runner
567553
if: needs.configuration.outputs.is_main_branch == 'true' && needs.configuration.outputs.is_scheduled_run != 'true'
568554
uses: ./.github/workflows/code-updates.yml
569555
secrets: inherit
@@ -573,7 +559,6 @@ jobs:
573559
needs:
574560
- configuration
575561
- build-gitpod
576-
- create-runner
577562
if: needs.configuration.outputs.is_main_branch == 'true' && needs.configuration.outputs.is_scheduled_run != 'true'
578563
uses: ./.github/workflows/jetbrains-updates.yml
579564
secrets: inherit
@@ -598,23 +583,3 @@ jobs:
598583
SLACK_COLOR: "danger"
599584
SLACK_MESSAGE: "⚠️ Security Alert: Daily vulnerability scan detected critical vulnerabilities in the following packages:\n${{ needs.build-gitpod.outputs.affected_packages }}"
600585
SLACK_FOOTER: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Workflow Logs>"
601-
602-
delete-runner:
603-
if: always()
604-
needs:
605-
- create-runner
606-
- configuration
607-
- build-previewctl
608-
- infrastructure
609-
- build-gitpod
610-
- install-app
611-
- install
612-
- monitoring
613-
- integration-test
614-
- notify-scheduled-failure
615-
uses: gitpod-io/gce-github-runner/.github/workflows/delete-vm.yml@main
616-
secrets:
617-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
618-
with:
619-
runner-label: ${{ needs.create-runner.outputs.label }}
620-
machine-zone: ${{ needs.create-runner.outputs.machine-zone }}

.github/workflows/code-nightly.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,8 @@ on:
88
- cron: "0 0 * * *"
99

1010
jobs:
11-
create-runner:
12-
uses: gitpod-io/gce-github-runner/.github/workflows/create-vm.yml@main
13-
secrets:
14-
runner_token: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_TOKEN }}
15-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
16-
1711
build:
18-
runs-on: ${{ needs.create-runner.outputs.label }}
19-
needs: [create-runner]
12+
runs-on: ubuntu-latest
2013
container:
2114
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
2215
steps:
@@ -56,15 +49,3 @@ jobs:
5649
SLACK_WEBHOOK: ${{ secrets.IDE_SLACK_WEBHOOK }}
5750
SLACK_COLOR: ${{ job.status }}
5851
SLACK_FOOTER: "<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Workflow logs>"
59-
60-
delete-runner:
61-
if: always()
62-
needs:
63-
- create-runner
64-
- build
65-
uses: gitpod-io/gce-github-runner/.github/workflows/delete-vm.yml@main
66-
secrets:
67-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
68-
with:
69-
runner-label: ${{ needs.create-runner.outputs.label }}
70-
machine-zone: ${{ needs.create-runner.outputs.machine-zone }}

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

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,9 @@ on:
3232
- cron: "0 3 * * *"
3333

3434
jobs:
35-
create-runner:
36-
uses: gitpod-io/gce-github-runner/.github/workflows/create-vm.yml@main
37-
secrets:
38-
runner_token: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_TOKEN }}
39-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
40-
4135
configuration:
4236
name: Configuration
43-
runs-on: ${{ needs.create-runner.outputs.label }}
44-
needs: [create-runner]
37+
runs-on: ubuntu-latest
4538
container:
4639
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
4740
outputs:
@@ -96,8 +89,8 @@ jobs:
9689

9790
infrastructure:
9891
name: Create preview environment infrastructure
99-
needs: [configuration, create-runner]
100-
runs-on: ${{ needs.create-runner.outputs.label }}
92+
needs: [configuration]
93+
runs-on: ubuntu-latest
10194
concurrency:
10295
group: ${{ needs.configuration.outputs.name }}-infrastructure
10396
steps:
@@ -128,8 +121,8 @@ jobs:
128121

129122
check:
130123
name: Check for regressions
131-
needs: [configuration, infrastructure, create-runner]
132-
runs-on: ${{ needs.create-runner.outputs.label }}
124+
needs: [configuration, infrastructure]
125+
runs-on: ubuntu-latest
133126
container:
134127
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
135128
volumes:
@@ -216,9 +209,9 @@ jobs:
216209

217210
delete:
218211
name: Delete preview environment
219-
needs: [configuration, infrastructure, check, create-runner]
212+
needs: [configuration, infrastructure, check]
220213
if: github.event.inputs.skip_delete != 'true' && always()
221-
runs-on: ${{ needs.create-runner.outputs.label }}
214+
runs-on: ubuntu-latest
222215
steps:
223216
- uses: actions/checkout@v4
224217
- name: Setup Environment
@@ -231,18 +224,3 @@ jobs:
231224
uses: ./.github/actions/delete-preview
232225
with:
233226
name: ${{ needs.configuration.outputs.name }}
234-
235-
delete-runner:
236-
if: always()
237-
needs:
238-
- create-runner
239-
- configuration
240-
- infrastructure
241-
- check
242-
- delete
243-
uses: gitpod-io/gce-github-runner/.github/workflows/delete-vm.yml@main
244-
secrets:
245-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
246-
with:
247-
runner-label: ${{ needs.create-runner.outputs.label }}
248-
machine-zone: ${{ needs.create-runner.outputs.machine-zone }}

.github/workflows/jetbrains-auto-update-template.yml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,10 @@ on:
1212
required: true
1313

1414
jobs:
15-
create-runner:
16-
uses: gitpod-io/gce-github-runner/.github/workflows/create-vm.yml@main
17-
secrets:
18-
runner_token: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_TOKEN }}
19-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
20-
with:
21-
task: ${{ inputs.productId }}
22-
2315
update-jetbrains:
24-
runs-on: ${{ needs.create-runner.outputs.label }}
16+
runs-on: ubuntu-latest
2517
container:
2618
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
27-
needs: [ create-runner ]
2819
steps:
2920
- uses: actions/checkout@v2
3021
- name: Setup Environment
@@ -79,15 +70,3 @@ jobs:
7970
SLACK_COLOR: ${{ job.status }}
8071
SLACK_TITLE: Upgrade latest ${{ inputs.productId }} image with ${{ steps.find-target.outputs.editorSummary }}
8172
SLACK_FOOTER: "<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Workflow logs>"
82-
83-
delete-runner:
84-
if: always()
85-
needs:
86-
- create-runner
87-
- update-jetbrains
88-
uses: gitpod-io/gce-github-runner/.github/workflows/delete-vm.yml@main
89-
secrets:
90-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
91-
with:
92-
runner-label: ${{ needs.create-runner.outputs.label }}
93-
machine-zone: ${{ needs.create-runner.outputs.machine-zone }}

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,10 @@ on:
3232
description: Build URL
3333
required: true
3434
jobs:
35-
create-runner:
36-
uses: gitpod-io/gce-github-runner/.github/workflows/create-vm.yml@main
37-
secrets:
38-
runner_token: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_TOKEN }}
39-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
4035
jetbrains-smoke-test-linux:
4136
container:
4237
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
43-
runs-on: ${{ needs.create-runner.outputs.label }}
44-
needs: [create-runner]
38+
runs-on: ubuntu-latest
4539
steps:
4640
- name: Generate Summary
4741
if: always()
@@ -124,14 +118,3 @@ jobs:
124118
name: video
125119
path: |
126120
dev/jetbrains-test/build/reports
127-
delete-runner:
128-
if: always()
129-
needs:
130-
- create-runner
131-
- jetbrains-smoke-test-linux
132-
uses: gitpod-io/gce-github-runner/.github/workflows/delete-vm.yml@main
133-
secrets:
134-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
135-
with:
136-
runner-label: ${{ needs.create-runner.outputs.label }}
137-
machine-zone: ${{ needs.create-runner.outputs.machine-zone }}

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

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,9 @@ on:
2525
default: "eu.gcr.io/gitpod-core-dev/build"
2626

2727
jobs:
28-
create-runner:
29-
uses: gitpod-io/gce-github-runner/.github/workflows/create-vm.yml@main
30-
secrets:
31-
runner_token: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_TOKEN }}
32-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
33-
3428
configuration:
35-
needs: [create-runner]
3629
name: Configuration
37-
runs-on: ${{ needs.create-runner.outputs.label }}
30+
runs-on: ubuntu-latest
3831
outputs:
3932
skip: ${{ steps.configuration.outputs.skip }}
4033
name: ${{ steps.configuration.outputs.name }}
@@ -64,8 +57,8 @@ jobs:
6457
6558
infrastructure:
6659
name: Create preview environment infrastructure
67-
needs: [configuration, create-runner]
68-
runs-on: ${{ needs.create-runner.outputs.label }}
60+
needs: [configuration]
61+
runs-on: ubuntu-latest
6962
concurrency:
7063
group: ${{ needs.configuration.outputs.name }}-infrastructure
7164
steps:
@@ -95,9 +88,9 @@ jobs:
9588

9689
check:
9790
name: Check for regressions
98-
needs: [configuration, infrastructure, create-runner]
91+
needs: [configuration, infrastructure]
9992
if: ${{ needs.configuration.outputs.skip == 'false' }}
100-
runs-on: ${{ needs.create-runner.outputs.label }}
93+
runs-on: ubuntu-latest
10194
container:
10295
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389
10396
volumes:
@@ -172,9 +165,9 @@ jobs:
172165

173166
delete:
174167
name: Delete preview environment
175-
needs: [configuration, infrastructure, check, create-runner]
168+
needs: [configuration, infrastructure, check]
176169
if: always()
177-
runs-on: ${{ needs.create-runner.outputs.label }}
170+
runs-on: ubuntu-latest
178171
steps:
179172
- uses: actions/checkout@v4
180173
- name: Setup Environment
@@ -187,18 +180,3 @@ jobs:
187180
uses: ./.github/actions/delete-preview
188181
with:
189182
name: ${{ needs.configuration.outputs.name }}
190-
191-
delete-runner:
192-
if: always()
193-
needs:
194-
- create-runner
195-
- configuration
196-
- infrastructure
197-
- check
198-
- delete
199-
uses: gitpod-io/gce-github-runner/.github/workflows/delete-vm.yml@main
200-
secrets:
201-
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
202-
with:
203-
runner-label: ${{ needs.create-runner.outputs.label }}
204-
machine-zone: ${{ needs.create-runner.outputs.machine-zone }}

0 commit comments

Comments
 (0)