Skip to content

Commit 41f08d2

Browse files
committed
Merge main aff553b into #742
Merge main aff553b into the #742 branch without rebasing or force-updating it. Keep the complete #743 main delta. Conflict resolutions: - scripts/ci_preflight.py: keep #742's NATIVE_X86_JOB mapping to the spot 32CPU label while retaining main's on-demand build and sanitizer labels. - scripts/test_ci_preflight.py: keep the matching NATIVE_X86_JOB expectation and main's on-demand build and sanitizer expectations. All other main hunks are retained, including the workflow, allowlist, docs, rerun-controller, release-gate, and rerun-preempted changes.
2 parents 4737131 + aff553b commit 41f08d2

9 files changed

Lines changed: 50 additions & 40 deletions

File tree

‎.github/actionlint.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ self-hosted-runner:
77
- gke-2cpu-4gb-amd64
88
- gke-4cpu-8gb-amd64
99
- gke-32cpu-64gb-amd64
10-
- gke-32cpu-64gb-amd64-256gb
10+
- gke-ondemand-32cpu-64gb-amd64
11+
- gke-ondemand-32cpu-64gb-amd64-256gb
1112
- gke-16cpu-32gb-amd64
1213
- gke-16cpu-32gb-amd64-128gb
1314
- gke-16cpu-32gb-amd64-256gb

‎.github/runner-group-allowlist.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# gke-16cpu-32gb-amd64-128gb: ci-post.yml, gke-pr.yml, native-live.yml
55
# gke-16cpu-32gb-amd64-256gb: native-live.yml
66
# gke-16cpu-32gb-arm64-128gb: ci-post.yml, gke-pr.yml
7-
# gke-32cpu-64gb-amd64-256gb: ci-post.yml
7+
# gke-ondemand-32cpu-64gb-amd64: ci-post.yml
8+
# gke-ondemand-32cpu-64gb-amd64-256gb: ci-post.yml
89
# This mirror does not verify that the new scale sets belong to group 14.
910
pineforge-4pass/pineforge-engine/.github/workflows/ci-post.yml@refs/heads/main
1011
pineforge-4pass/pineforge-engine/.github/workflows/ci.yml@refs/heads/main

‎.github/workflows/ci-post.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ jobs:
290290
shard: [1, 2, 3, 4]
291291

292292
# Four shards divide roughly 15,300 measured CTest row-seconds.
293-
runs-on: gke-32cpu-64gb-amd64
293+
runs-on: gke-ondemand-32cpu-64gb-amd64
294294

295295
steps:
296296
- name: Refuse an unauthorised run before anything else
@@ -569,7 +569,7 @@ jobs:
569569
fail-fast: false
570570
matrix:
571571
shard: [1, 2, 3, 4, 5, 6, 7, 8]
572-
runs-on: gke-32cpu-64gb-amd64-256gb
572+
runs-on: gke-ondemand-32cpu-64gb-amd64-256gb
573573
env:
574574
ASAN_OPTIONS: detect_leaks=1:halt_on_error=1:abort_on_error=1
575575
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1

‎docs/ci.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Missing logs, mixed failures, arm64/`gkp-*` jobs, stale attempts and changed run
3535
refuse the retry; three total attempts are allowed. PRs, manual dispatches and
3636
release/publish/deploy/promotion workflows are excluded. The controller runs on
3737
hosted `ubuntu-24.04`, uses its trusted default-branch workflow commit, and never
38-
prints log bodies. Missing `gh`, `python3` or the log escape flag fails the job.
38+
prints log bodies. Missing `gh`, `python3` or the log escape flag fails the job. The post-merge on-demand amd64 labels are included in the same loss-retry fleet; if that routing is rolled back, land a revert PR for the label commit before the next post-merge run.
3939

4040
A GitHub-only PR changes at least one path, all under `.github/`, including both sides of a rename.
4141
`scripts/ci_*.py` changes, alone or mixed with `.github/`, follow the ordinary proof plan.
@@ -1642,7 +1642,7 @@ The native matrix is exactly `1..4` with `--ctest-shard I/4`; live sanitizers ar
16421642
| `gke-pr.yml` | `pull_request_target` to `main` | Hosted admission/result; GKE preflight and proof legs; Debug `gke-16cpu-32gb-amd64-128gb`, arm64 `gke-16cpu-32gb-arm64-128gb` |
16431643
| `docs.yml` | `pull_request`, except `.github/**`-only diffs | `authz` and `build`: hosted `ubuntu-24.04` |
16441644
| `rerun-preempted.yml` | `workflow_run`: completed `CI post-merge` push/schedule runs on `main` | `rerun`: hosted `ubuntu-24.04` |
1645-
| `ci-post.yml` | Push to `main`, 01:30 UTC schedule, dispatch | Seven light jobs: scalar `gke-2cpu-4gb-amd64`; bare GKE scalars: Release `gke-32cpu-64gb-amd64`, sanitizers `gke-32cpu-64gb-amd64-256gb`, Debug `gke-16cpu-32gb-amd64-128gb`, kernel `gke-16cpu-32gb-amd64`, preflight tiers `gke-8cpu-16gb-amd64`, arm64 `gke-16cpu-32gb-arm64-128gb` |
1645+
| `ci-post.yml` | Push to `main`, 01:30 UTC schedule, dispatch | Seven light jobs: scalar `gke-2cpu-4gb-amd64`; bare GKE scalars: Release `gke-ondemand-32cpu-64gb-amd64`, sanitizers `gke-ondemand-32cpu-64gb-amd64-256gb`, Debug `gke-16cpu-32gb-amd64-128gb`, kernel `gke-16cpu-32gb-amd64`, preflight tiers `gke-8cpu-16gb-amd64`, arm64 `gke-16cpu-32gb-arm64-128gb` |
16461646
| `corpus-parity.yml` | Schedule, dispatch, post CI callers | `authz`: scalar `gke-4cpu-8gb-amd64`; bare GKE scalars: full parity `gke-16cpu-32gb-amd64`, subset `gke-8cpu-16gb-amd64` |
16471647
| `native-live.yml` | Dispatch and post CI callers on `main` | `authz` and both aggregates: scalar `gke-4cpu-8gb-amd64`; native shards: bare `gke-8cpu-16gb-amd64`; `matrix.runner`: live-sanitizers `gke-16cpu-32gb-amd64-256gb`, live-tsan `gke-16cpu-32gb-amd64-128gb` |
16481648
| `docs-post.yml` | Push to `main`, dispatch | `authz`: scalar `gke-2cpu-4gb-amd64`; credentialed `build`: `gkp-4cpu-8gb-amd64` |

‎scripts/ci/rerun_preempted.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
# Bare amd64 GKE scale sets, optionally with the fleet's disk-size suffix.
3939
# No arm64, gkp pools or operator-dispatched entrypoints are admitted.
40-
FLEET_LABEL = re.compile(r'gke-(?:2|4|8|16|32)cpu-(?:4|8|16|32|64)gb-amd64(?:-(?:64|128|256|512)gb)?')
40+
FLEET_LABEL = re.compile(r'gke-(?:ondemand-)?(?:2|4|8|16|32)cpu-(?:4|8|16|32|64)gb-amd64(?:-(?:64|128|256|512)gb)?')
4141
LOSS_PATTERNS = (
4242
re.compile(r'The runner has received a shutdown signal\..*', re.I),
4343
re.compile(r'(?:The runner[: ]+.*?)?lost communication with the server\b.*', re.I),

‎scripts/ci_preflight.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
GKE_ARM_LABEL = 'gke-16cpu-32gb-arm64'
110110
GKE_2_LABEL = 'gke-2cpu-4gb-amd64'
111111
GKE_4_LABEL = 'gke-4cpu-8gb-amd64'
112+
GKE_ONDEMAND_32_LABEL = 'gke-ondemand-32cpu-64gb-amd64'
112113
GKP_JOB_RUNNERS = {
113114
'release.yml': {'release': RELEASE_RUNNER, 'notify-hub': RELEASE_RUNNER,
114115
'prebuilt': PREBUILT_RUNNER},
@@ -121,7 +122,7 @@
121122
'release-ruleset-probe.yml': {'probe': 'release'},
122123
'promote-baseline.yml': {'promote': 'release-bot'},
123124
}
124-
GKE_32_256_LABEL = 'gke-32cpu-64gb-amd64-256gb'
125+
GKE_ONDEMAND_32_256_LABEL = 'gke-ondemand-32cpu-64gb-amd64-256gb'
125126
GKE_16_128_LABEL = 'gke-16cpu-32gb-amd64-128gb'
126127
GKE_16_256_LABEL = 'gke-16cpu-32gb-amd64-256gb'
127128
GKE_ARM_128_LABEL = 'gke-16cpu-32gb-arm64-128gb'
@@ -134,9 +135,9 @@
134135
'build-debug': GKE_16_128_LABEL,
135136
'corpus-parity-subset': GKE_8_LABEL},
136137
'ci-post.yml': {'preflight': GKE_8_LABEL, 'preflight-slow': GKE_8_LABEL,
137-
'build': GKE_32_LABEL, 'build-debug': GKE_16_128_LABEL,
138138
NATIVE_X86_JOB: GKE_32_LABEL,
139-
'sanitizers': GKE_32_256_LABEL, 'kernel-only': GKE_16_LABEL,
139+
'build': GKE_ONDEMAND_32_LABEL, 'build-debug': GKE_16_128_LABEL,
140+
'sanitizers': GKE_ONDEMAND_32_256_LABEL, 'kernel-only': GKE_16_LABEL,
140141
'build-arm': GKE_ARM_128_LABEL},
141142
'corpus-parity.yml': {'corpus-parity': GKE_16_LABEL, 'corpus-parity-subset': GKE_8_LABEL},
142143
'native-live.yml': {'native-live': GKE_MATRIX_RUNNER, 'native-live-shards': GKE_8_LABEL},
@@ -2462,7 +2463,7 @@ def _authz_header(name: str) -> str:
24622463

24632464
_GKE_ROUTE = re.compile(r'(?<![\w.-])gke-[\w.-]+', re.IGNORECASE)
24642465
_GKE_SCALE_LABEL = re.compile(
2465-
r'(?<![\w.-])gke-\d+cpu-\d+gb-(?:amd64|arm64)(?:-(?:128|256)gb)?(?![\w.-])')
2466+
r'(?<![\w.-])gke-(?:ondemand-)?\d+cpu-\d+gb-(?:amd64|arm64)(?:-(?:128|256)gb)?(?![\w.-])')
24662467
_GKP_ROUTE = re.compile(r'(?<![\w.-])gkp-[\w.-]+', re.IGNORECASE)
24672468
_GKP_SCALE_LABEL = re.compile(r'gkp-(?:od-)?\d+cpu-\d+gb-amd64(?:-\d+gb)?')
24682469

@@ -2684,7 +2685,7 @@ def resolve(value: str, stack: tuple[str, ...]) -> list[str] | None:
26842685

26852686
# Disk suffixes still require group membership; admitted sizes are pinned separately.
26862687
_RUNNER_GROUP_LABEL = re.compile(
2687-
r'(?<![\w.-])(?:gke|gkp(?:-od)?)-\d+cpu-\d+gb-[A-Za-z0-9_]+(?:-\d+gb)?(?![\w.-])',
2688+
r'(?<![\w.-])(?:gke(?:-ondemand)?|gkp(?:-od)?)-\d+cpu-\d+gb-[A-Za-z0-9_]+(?:-\d+gb)?(?![\w.-])',
26882689
re.IGNORECASE)
26892690
_REPOSITORY_ID = r'[A-Za-z0-9][A-Za-z0-9_.-]*/[A-Za-z0-9][A-Za-z0-9_.-]*'
26902691
_RUNNER_GROUP_REFERENCE = re.compile(

‎scripts/test_ci_preflight.py‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ class ParallelCommand(tuple):
5959

6060
GKE_32 = 'gke-32cpu-64gb-amd64'
6161
GKE_16 = 'gke-16cpu-32gb-amd64'
62-
GKE_32_256 = 'gke-32cpu-64gb-amd64-256gb'
62+
GKE_ONDEMAND_32 = 'gke-ondemand-32cpu-64gb-amd64'
63+
GKE_ONDEMAND_32_256 = 'gke-ondemand-32cpu-64gb-amd64-256gb'
6364
GKE_16_128 = 'gke-16cpu-32gb-amd64-128gb'
6465
GKE_16_256 = 'gke-16cpu-32gb-amd64-256gb'
6566
GKE_8 = 'gke-8cpu-16gb-amd64'
@@ -102,9 +103,9 @@ class ParallelCommand(tuple):
102103
'build-arm': GKE_ARM,
103104
'corpus-parity-subset': GKE_PR_8},
104105
'ci-post.yml': {'preflight': GKE_8, 'preflight-slow': GKE_8,
105-
'build': GKE_32, 'build-debug': GKE_16_128,
106106
NATIVE_X86_JOB: GKE_32,
107-
'sanitizers': GKE_32_256, 'kernel-only': GKE_16, 'build-arm': GKE_ARM},
107+
'build': GKE_ONDEMAND_32, 'build-debug': GKE_16_128,
108+
'sanitizers': GKE_ONDEMAND_32_256, 'kernel-only': GKE_16, 'build-arm': GKE_ARM},
108109
'corpus-parity.yml': {'corpus-parity': GKE_16, 'corpus-parity-subset': GKE_8},
109110
'native-live.yml': {'native-live': NATIVE_RUNNER, 'native-live-shards': GKE_8},
110111
}
@@ -231,8 +232,8 @@ class ParallelCommand(tuple):
231232
'release-ruleset-probe.yml': ('authz',),
232233
}
233234
HOSTED_SHARD_JOB_LABELS = {
234-
'build': GKE_32, 'build-debug': GKE_16_128,
235-
'sanitizers': GKE_32_256, 'kernel-only': GKE_16,
235+
'build': GKE_ONDEMAND_32, 'build-debug': GKE_16_128,
236+
'sanitizers': GKE_ONDEMAND_32_256, 'kernel-only': GKE_16,
236237
}
237238
HEAVY_CI_JOBS = ('preflight-slow', 'sanitizers', 'kernel-only', 'native-live', 'corpus-parity')
238239
PREFLIGHT_RUN = 'python3 scripts/ci_preflight.py --output-dir build-ci-preflight --tier fast'
@@ -2745,7 +2746,7 @@ def test_post_fleet_docs_match_runner_policy(self):
27452746
'`gke-2cpu-4gb-amd64` instance in separate roots; their image must include `gh` for permission lookups.',
27462747
'| `ci-post.yml` | Push to `main`, 01:30 UTC schedule, dispatch | '
27472748
'Seven light jobs: scalar `gke-2cpu-4gb-amd64`; bare GKE scalars: '
2748-
'Release `gke-32cpu-64gb-amd64`, sanitizers `gke-32cpu-64gb-amd64-256gb`, Debug `gke-16cpu-32gb-amd64-128gb`, kernel `gke-16cpu-32gb-amd64`, '
2749+
'Release `gke-ondemand-32cpu-64gb-amd64`, sanitizers `gke-ondemand-32cpu-64gb-amd64-256gb`, Debug `gke-16cpu-32gb-amd64-128gb`, kernel `gke-16cpu-32gb-amd64`, '
27492750
'preflight tiers `gke-8cpu-16gb-amd64`, arm64 `gke-16cpu-32gb-arm64-128gb` |',
27502751
'| `native-live.yml` | Dispatch and post CI callers on `main` | '
27512752
'`authz` and both aggregates: scalar `gke-4cpu-8gb-amd64`; '
@@ -2790,11 +2791,11 @@ def test_post_fleet_docs_refuse_same_size_wrong_protected_runner(self):
27902791

27912792

27922793
POST_SHARD_CASES = (
2793-
('build', 'release', 4, GKE_32, 'build-release-gate',
2794+
('build', 'release', 4, GKE_ONDEMAND_32, 'build-release-gate',
27942795
'build (ubuntu-24.04, Release)'),
27952796
('build-debug', 'debug', 2, GKE_16_128, 'build-debug-gate',
27962797
'build (ubuntu-24.04, Debug)'),
2797-
('sanitizers', 'sanitizers', 8, GKE_32_256, 'sanitizers-gate', 'sanitizers'),
2798+
('sanitizers', 'sanitizers', 8, GKE_ONDEMAND_32_256, 'sanitizers-gate', 'sanitizers'),
27982799
('kernel-only', 'kernel', 2, GKE_16, 'kernel-only-gate', 'kernel-only'),
27992800
)
28002801

@@ -3019,7 +3020,7 @@ def arm_post(self):
30193020
arm = arm.replace(' platform:\n - os: ubuntu-24.04\n', '', 1)
30203021
arm = arm.replace(' build_type: [Release]\n',
30213022
' build_type: [Release, Debug]\n', 1)
3022-
arm = arm.replace(f' runs-on: {GKE_32}\n', f' runs-on: {GKE_ARM}\n', 1)
3023+
arm = arm.replace(f' runs-on: {GKE_ONDEMAND_32}\n', f' runs-on: {GKE_ARM}\n', 1)
30233024
arm = arm.replace(' --ctest-shard ${{ matrix.shard }}/4\n',
30243025
' --ctest-shard ${{ matrix.shard }}/4' + POST_ARM_CTEST_EXCLUSION + '\n', 1)
30253026
arm = arm.replace(" env:\n PF_CI_LABELS: "
@@ -4163,7 +4164,8 @@ def test_post_sized_labels_need_exact_ref(self):
41634164
self.assertCountEqual(self.failures(lines), [
41644165
self.missing('ci-post.yml', label)
41654166
for label in (GKE_2, GKE_8, GKE_16, GKE_16_128,
4166-
GKE_32, GKE_32_256, GKE_ARM)])
4167+
GKE_ONDEMAND_32, GKE_ONDEMAND_32_256,
4168+
GKE_ARM)])
41674169

41684170
def test_matrix_include_and_axis_resolve_the_runner_in_a_real_workflow(self):
41694171
self.omit('docs-post.yml')
@@ -6573,15 +6575,15 @@ def test_ci_contract_pins_spot_runners_time_limits_and_parallelism(self):
65736575
# Each scoped pool job must keep its canon array without a hosted fallback.
65746576
(6, 'preflight', runner_declaration(GKE_8), runner_declaration('pf-linux-x64-16'),
65756577
f'ci-post.yml job preflight must run on {GKE_8}'),
6576-
(6, 'sanitizers', runner_declaration(GKE_32_256), runner_declaration('macos-26-xlarge'),
6577-
f'ci-post.yml job sanitizers must run on {GKE_32_256}'),
6578+
(6, 'sanitizers', runner_declaration(GKE_ONDEMAND_32_256), runner_declaration('macos-26-xlarge'),
6579+
f'ci-post.yml job sanitizers must run on {GKE_ONDEMAND_32_256}'),
65786580
(6, 'kernel-only', runner_declaration(GKE_16), runner_declaration('ubuntu-latest'),
65796581
f'ci-post.yml job kernel-only must run on {GKE_16}'),
65806582
# Target runs-on exactly, never an earlier matrix reference or name.
6581-
(6, 'build', runner_declaration(GKE_32),
6582-
' runs-on: macos-26-large\n', f'ci-post.yml job build must run on {GKE_32}'),
6583-
(6, 'build', runner_declaration(GKE_32),
6584-
' runs-on: ${{ matrix.larger_runner }}\n', f'ci-post.yml job build must run on {GKE_32}'),
6583+
(6, 'build', runner_declaration(GKE_ONDEMAND_32),
6584+
' runs-on: macos-26-large\n', f'ci-post.yml job build must run on {GKE_ONDEMAND_32}'),
6585+
(6, 'build', runner_declaration(GKE_ONDEMAND_32),
6586+
' runs-on: ${{ matrix.larger_runner }}\n', f'ci-post.yml job build must run on {GKE_ONDEMAND_32}'),
65856587
(1, 'native-live', runner_declaration(NATIVE_RUNNER), runner_declaration('pf-linux-x64-16'),
65866588
f'native-live.yml job native-live must run on {NATIVE_RUNNER}'),
65876589
(4, 'corpus-parity', runner_declaration(GKE_16), runner_declaration('pf-linux-x64-16'),
@@ -6598,10 +6600,10 @@ def test_ci_contract_pins_spot_runners_time_limits_and_parallelism(self):
65986600
(4, 'corpus-parity', runner_declaration(GKE_16),
65996601
runner_declaration("${{ github.event_name == 'schedule' && 'pf-linux-x64-16' || 'ubuntu-24.04' }}"),
66006602
f'corpus-parity.yml job corpus-parity must run on {GKE_16}'),
6601-
(6, 'sanitizers', runner_declaration(GKE_32_256),
6603+
(6, 'sanitizers', runner_declaration(GKE_ONDEMAND_32_256),
66026604
runner_declaration("${{ github.event.pull_request.head.repo.full_name == github.repository "
66036605
"&& 'pf-linux-x64-16' || 'ubuntu-24.04' }}"),
6604-
f'ci-post.yml job sanitizers must run on {GKE_32_256}'),
6606+
f'ci-post.yml job sanitizers must run on {GKE_ONDEMAND_32_256}'),
66056607
(6, 'native-live', 'uses: ./.github/workflows/native-live.yml',
66066608
'uses: someone/else/.github/workflows/native-live.yml@main',
66076609
'ci-post.yml job native-live calls a workflow the runner contract cannot see; '
@@ -8309,12 +8311,12 @@ def test_the_preflight_stage_fails_bad_spot_labels_or_paid_runners(self):
83098311
runner_declaration(json.dumps(
83108312
['self-hosted', json.loads(PR_RUNNER)[1], RETIRED_VM_LABELS[0]]))),
83118313
f'gke-pr.yml job preflight must run on {GKE_PR_8}'),
8312-
('ci-post.yml', ('sanitizers', runner_declaration(GKE_32_256),
8314+
('ci-post.yml', ('sanitizers', runner_declaration(GKE_ONDEMAND_32_256),
83138315
runner_declaration('["self-hosted","pf-gcp-small"]')),
8314-
f'ci-post.yml job sanitizers must run on {GKE_32_256}'),
8315-
('ci-post.yml', ('sanitizers', runner_declaration(GKE_32_256),
8316+
f'ci-post.yml job sanitizers must run on {GKE_ONDEMAND_32_256}'),
8317+
('ci-post.yml', ('sanitizers', runner_declaration(GKE_ONDEMAND_32_256),
83168318
runner_declaration('pf-linux-x64-16')),
8317-
f'ci-post.yml job sanitizers must run on {GKE_32_256}'),
8319+
f'ci-post.yml job sanitizers must run on {GKE_ONDEMAND_32_256}'),
83188320
('ci-post.yml', ('build-arm', runner_declaration(GKE_ARM),
83198321
' runs-on: macos-26-xlarge\n'),
83208322
'ci-post.yml must not use larger-runner labels; use the GCP fleet or hosted exceptions'),
@@ -9819,9 +9821,9 @@ def test_actionlint_runner_labels_rejects_removed_label(self):
98199821
(GKP_2, (('release-ruleset-probe.yml', 'probe'), ('promote-baseline.yml', 'promote'))),
98209822
(GKP_OD_4, (('release.yml', 'release'), ('release.yml', 'notify-hub'))),
98219823
(GKP_OD_PREBUILT, (('release.yml', 'prebuilt'),)),
9822-
('gke-32cpu-64gb-amd64', (('gke-pr.yml', 'build'),
9823-
('ci-post.yml', 'build'))),
9824-
('gke-32cpu-64gb-amd64-256gb', (('ci-post.yml', 'sanitizers'),)),
9824+
('gke-32cpu-64gb-amd64', (('gke-pr.yml', 'build'),)),
9825+
('gke-ondemand-32cpu-64gb-amd64', (('ci-post.yml', 'build'),)),
9826+
('gke-ondemand-32cpu-64gb-amd64-256gb', (('ci-post.yml', 'sanitizers'),)),
98259827
('gke-16cpu-32gb-amd64', (('ci-post.yml', 'kernel-only'), ('corpus-parity.yml', 'corpus-parity'))),
98269828
('gke-16cpu-32gb-amd64-128gb', (('gke-pr.yml', 'build-debug'),
98279829
('ci-post.yml', 'build-debug'), ('native-live.yml', 'native-live'))),

‎scripts/test_ci_release_gate.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2448,7 +2448,7 @@ def ci_post_build_names(self, jobs):
24482448
self.assertEqual([value.strip() for value in types[1].split(",")], [build_type])
24492449
platforms = re.findall(r"(?m)^ - os: (\S+)$", matrix[1])
24502450
self.assertEqual(platforms, ["ubuntu-24.04"])
2451-
self.assert_gke_build(body, {"build": "gke-32cpu-64gb-amd64",
2451+
self.assert_gke_build(body, {"build": "gke-ondemand-32cpu-64gb-amd64",
24522452
"build-debug": "gke-16cpu-32gb-amd64-128gb"}[job_id])
24532453
shards = re.findall(r"(?m)^ shard: \[([0-9, ]+)\]$", matrix[1])
24542454
self.assertEqual(len(shards), 1)
@@ -2515,7 +2515,7 @@ def test_ci_post_required_build_jobs_reject_dropped_shard(self):
25152515
def test_ci_post_required_build_jobs_reject_runner_or_container_drift(self):
25162516
workflow = (ROOT / ".github/workflows/ci-post.yml").read_text()
25172517
self.ci_post_build_names(_jobs(workflow))
2518-
for job, label in (("build", "gke-32cpu-64gb-amd64"),
2518+
for job, label in (("build", "gke-ondemand-32cpu-64gb-amd64"),
25192519
("build-debug", "gke-16cpu-32gb-amd64-128gb"),
25202520
("build-arm", "gke-16cpu-32gb-arm64-128gb")):
25212521
for before, after, finding in (

‎scripts/test_ci_rerun_preempted.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,10 @@ def test_wave6_cut_reruns_only_failed_jobs(self):
182182

183183
def test_plain_and_disk_sized_amd64_labels(self):
184184
for label in ('gke-8cpu-16gb-amd64', 'gke-32cpu-64gb-amd64',
185-
'gke-32cpu-64gb-amd64-256gb', 'gke-16cpu-32gb-amd64-128gb'):
185+
'gke-32cpu-64gb-amd64-256gb',
186+
'gke-ondemand-32cpu-64gb-amd64',
187+
'gke-ondemand-32cpu-64gb-amd64-256gb',
188+
'gke-16cpu-32gb-amd64-128gb'):
186189
with self.subTest(label=label):
187190
job = deepcopy(CUT_JOB)
188191
job['labels'] = [label]
@@ -262,6 +265,8 @@ def test_mixed_failure_later_page_refused(self):
262265

263266
def test_arm64_and_gkp_jobs_are_refused(self):
264267
for label in ('gke-16cpu-32gb-arm64', 'gke-32cpu-64gb-arm64-256gb',
268+
'gke-ondemand-32cpu-64gb-arm64',
269+
'gke-ondemand-32cpu-64gb-amd64-extra',
265270
'gkp-8cpu-16gb-amd64', 'gkp-32cpu-64gb-amd64-256gb',
266271
'ubuntu-24.04', 'gke-32cpu-64gb-amd64-extra'):
267272
with self.subTest(label=label):

0 commit comments

Comments
 (0)