Skip to content

Commit 12148f9

Browse files
luisleo526claude
andcommitted
ci: run the release path on on-demand runners
Move release publishing, hub notification and Linux x86_64 prebuilt builds to exact on-demand runner pins. Retain promotion, probe and hosted arm64 routing, and update preflight guards and runner label controls. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent cf68f15 commit 12148f9

4 files changed

Lines changed: 95 additions & 57 deletions

File tree

‎.github/actionlint.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ self-hosted-runner:
1818
- gkp-2cpu-4gb-amd64
1919
- gkp-4cpu-8gb-amd64
2020
- gkp-16cpu-32gb-amd64-128gb
21+
- gkp-od-4cpu-8gb-amd64
22+
- gkp-od-16cpu-32gb-amd64-128gb
2123
- pf-ci-x64
2224
- pf-ci-x64-16

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ env:
7777

7878
jobs:
7979
release:
80-
runs-on: gkp-2cpu-4gb-amd64
80+
runs-on: gkp-od-4cpu-8gb-amd64
8181
environment: release
8282

8383
outputs:
@@ -366,7 +366,7 @@ jobs:
366366
matrix:
367367
include:
368368
- triple: linux-x86_64
369-
runner: gkp-16cpu-32gb-amd64-128gb
369+
runner: gkp-od-16cpu-32gb-amd64-128gb
370370
- triple: linux-aarch64
371371
runner: ubuntu-22.04-arm
372372
runs-on: ${{ matrix.runner }}
@@ -504,7 +504,7 @@ jobs:
504504
notify-hub:
505505
needs: [release, prebuilt]
506506
if: ${{ !inputs.dry_run }}
507-
runs-on: gkp-2cpu-4gb-amd64
507+
runs-on: gkp-od-4cpu-8gb-amd64
508508
environment: release
509509
steps:
510510
- name: Mint org App token (hub dispatch)

‎scripts/ci_preflight.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@
9999
PR_RUNNER = '["self-hosted","pf-gcp-pr"]'
100100
# There is no general post fleet: an unpinned job on this label is refused.
101101
POST_RUNNER = 'gke-2cpu-4gb-amd64'
102-
RELEASE_RUNNER = 'gkp-2cpu-4gb-amd64'
103-
PREBUILT_RUNNER = 'gkp-16cpu-32gb-amd64-128gb'
102+
PROTECTED_RUNNER = 'gkp-2cpu-4gb-amd64'
103+
RELEASE_RUNNER = 'gkp-od-4cpu-8gb-amd64'
104+
PREBUILT_RUNNER = 'gkp-od-16cpu-32gb-amd64-128gb'
104105
GKE_32_LABEL = 'gke-32cpu-64gb-amd64'
105106
GKE_16_LABEL = 'gke-16cpu-32gb-amd64'
106107
GKE_8_LABEL = 'gke-8cpu-16gb-amd64'
@@ -110,9 +111,9 @@
110111
GKP_JOB_RUNNERS = {
111112
'release.yml': {'release': RELEASE_RUNNER, 'notify-hub': RELEASE_RUNNER,
112113
'prebuilt': PREBUILT_RUNNER},
113-
'promote-baseline.yml': {'promote': RELEASE_RUNNER},
114+
'promote-baseline.yml': {'promote': PROTECTED_RUNNER},
114115
'docs-post.yml': {'build': 'gkp-4cpu-8gb-amd64'},
115-
'release-ruleset-probe.yml': {'probe': RELEASE_RUNNER},
116+
'release-ruleset-probe.yml': {'probe': PROTECTED_RUNNER},
116117
}
117118
GKP_JOB_ENVIRONMENTS = {
118119
'release.yml': {'release': 'release', 'notify-hub': 'release'},
@@ -345,8 +346,8 @@ def post_build_name(count: int) -> str:
345346
RELEASE_JOB_RUNNERS = {
346347
'release.yml': {'release': RELEASE_RUNNER, 'prebuilt': HOSTED_MATRIX_RUNNER,
347348
'notify-hub': RELEASE_RUNNER},
348-
'release-ruleset-probe.yml': {'probe': RELEASE_RUNNER},
349-
'promote-baseline.yml': {'promote': RELEASE_RUNNER},
349+
'release-ruleset-probe.yml': {'probe': PROTECTED_RUNNER},
350+
'promote-baseline.yml': {'promote': PROTECTED_RUNNER},
350351
}
351352
# Credential-bearing jobs outside the release pins and gated docs build retain
352353
# standard hosted labels. Existing hosted exceptions above are pinned separately.
@@ -2351,7 +2352,7 @@ def _authz_header(name: str) -> str:
23512352
_GKE_SCALE_LABEL = re.compile(
23522353
r'(?<![\w.-])gke-\d+cpu-\d+gb-(?:amd64|arm64)(?:-(?:128|256)gb)?(?![\w.-])')
23532354
_GKP_ROUTE = re.compile(r'(?<![\w.-])gkp-[\w.-]+', re.IGNORECASE)
2354-
_GKP_SCALE_LABEL = re.compile(r'gkp-\d+cpu-\d+gb-amd64(?:-\d+gb)?')
2355+
_GKP_SCALE_LABEL = re.compile(r'gkp-(?:od-)?\d+cpu-\d+gb-amd64(?:-\d+gb)?')
23552356

23562357

23572358
def _native_runner_matrix(name: str, job: str, body: str) -> bool:
@@ -2571,7 +2572,7 @@ def resolve(value: str, stack: tuple[str, ...]) -> list[str] | None:
25712572

25722573
# Disk suffixes still require group membership; admitted sizes are pinned separately.
25732574
_RUNNER_GROUP_LABEL = re.compile(
2574-
r'(?<![\w.-])(?:gke|gkp)-\d+cpu-\d+gb-[A-Za-z0-9_]+(?:-\d+gb)?(?![\w.-])',
2575+
r'(?<![\w.-])(?:gke|gkp(?:-od)?)-\d+cpu-\d+gb-[A-Za-z0-9_]+(?:-\d+gb)?(?![\w.-])',
25752576
re.IGNORECASE)
25762577
_REPOSITORY_ID = r'[A-Za-z0-9][A-Za-z0-9_.-]*/[A-Za-z0-9][A-Za-z0-9_.-]*'
25772578
_RUNNER_GROUP_REFERENCE = re.compile(

0 commit comments

Comments
 (0)