Skip to content

Commit 0e5615a

Browse files
committed
Merge branch 'w/129.0/bugfix/switch-to-gcp-runner' into tmp/octopus/q/129.0
2 parents d297c3f + dff5334 commit 0e5615a

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

.github/workflows/downgrade-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ env:
2929

3030
jobs:
3131
downgrade:
32-
# We need to use a large runner so that we have known runner IPs
33-
# It allows us to filter authorized IPs on the machines we spawn
34-
runs-on: ubuntu-24.04-4core
32+
# We need to use those specific gcloud runner so that we have
33+
# known runner IPs
34+
runs-on: [self-hosted, ubuntu, large, jammy, gcloud]
3535
env:
3636
NAME: downgrade-${{ inputs.type }}
3737
steps:

.github/workflows/lifecycle-promoted.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ env:
2828

2929
jobs:
3030
snapshot-upgrade:
31-
# We need to use a large runner so that we have known runner IPs
32-
# It allows us to filter authorized IPs on the machines we spawn
33-
runs-on: ubuntu-24.04-4core
31+
# We need to use those specific gcloud runner so that we have
32+
# known runner IPs
33+
runs-on: [self-hosted, ubuntu, large, jammy, gcloud]
3434
strategy:
3535
fail-fast: false
3636
matrix:

.github/workflows/multi-node-test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ env:
7979

8080
jobs:
8181
multi-node:
82-
# We need to use a large runner so that we have known runner IPs
83-
# It allows us to filter authorized IPs on the machines we spawn
84-
runs-on: ubuntu-24.04-4core
82+
# We need to use those specific gcloud runner so that we have
83+
# known runner IPs
84+
runs-on: [self-hosted, ubuntu, large, jammy, gcloud]
8585
env:
8686
SSH_PRIVATE_KEY: "~/.ssh/terraform"
8787
NODES_COUNT: ${{ inputs.nodes-count }}
@@ -374,9 +374,9 @@ jobs:
374374
destroy-multi-node-cluster:
375375
needs:
376376
- multi-node
377-
# We need to use a large runner so that we have known runner IPs
378-
# It allows us to filter authorized IPs on the machines we spawn
379-
runs-on: ubuntu-24.04-4core
377+
# We need to use those specific gcloud runner so that we have
378+
# known runner IPs
379+
runs-on: [self-hosted, ubuntu, large, jammy, gcloud]
380380
if: always()
381381
steps:
382382
- name: Checkout

.github/workflows/single-node-test.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ env:
8181

8282
jobs:
8383
single-node:
84-
# We need to use a large runner so that we have known runner IPs
85-
# It allows us to filter authorized IPs on the machines we spawn
86-
runs-on: ubuntu-24.04-4core
84+
# We need to use those specific gcloud runner so that we have
85+
# known runner IPs
86+
runs-on: [self-hosted, ubuntu, large, jammy, gcloud]
8787
env:
8888
SSH_PRIVATE_KEY: "~/.ssh/terraform"
8989
steps:
@@ -290,7 +290,9 @@ jobs:
290290
destroy-single-node-cluster:
291291
needs:
292292
- single-node
293-
runs-on: ubuntu-24.04-4core
293+
# We need to use those specific gcloud runner so that we have
294+
# known runner IPs
295+
runs-on: [self-hosted, ubuntu, large, jammy, gcloud]
294296
if: always()
295297
steps:
296298
- name: Checkout

.github/workflows/upgrade-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ env:
2929

3030
jobs:
3131
upgrade:
32-
# We need to use a large runner so that we have known runner IPs
33-
# It allows us to filter authorized IPs on the machines we spawn
34-
runs-on: ubuntu-24.04-4core
32+
# We need to use those specific gcloud runner so that we have
33+
# known runner IPs
34+
runs-on: [self-hosted, ubuntu, large, jammy, gcloud]
3535
env:
3636
NAME: upgrade-${{ inputs.type }}
3737
steps:

0 commit comments

Comments
 (0)