|
99 | 99 | PR_RUNNER = '["self-hosted","pf-gcp-pr"]' |
100 | 100 | # There is no general post fleet: an unpinned job on this label is refused. |
101 | 101 | 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' |
104 | 105 | GKE_32_LABEL = 'gke-32cpu-64gb-amd64' |
105 | 106 | GKE_16_LABEL = 'gke-16cpu-32gb-amd64' |
106 | 107 | GKE_8_LABEL = 'gke-8cpu-16gb-amd64' |
|
110 | 111 | GKP_JOB_RUNNERS = { |
111 | 112 | 'release.yml': {'release': RELEASE_RUNNER, 'notify-hub': RELEASE_RUNNER, |
112 | 113 | 'prebuilt': PREBUILT_RUNNER}, |
113 | | - 'promote-baseline.yml': {'promote': RELEASE_RUNNER}, |
| 114 | + 'promote-baseline.yml': {'promote': PROTECTED_RUNNER}, |
114 | 115 | 'docs-post.yml': {'build': 'gkp-4cpu-8gb-amd64'}, |
115 | | - 'release-ruleset-probe.yml': {'probe': RELEASE_RUNNER}, |
| 116 | + 'release-ruleset-probe.yml': {'probe': PROTECTED_RUNNER}, |
116 | 117 | } |
117 | 118 | GKP_JOB_ENVIRONMENTS = { |
118 | 119 | 'release.yml': {'release': 'release', 'notify-hub': 'release'}, |
@@ -345,8 +346,8 @@ def post_build_name(count: int) -> str: |
345 | 346 | RELEASE_JOB_RUNNERS = { |
346 | 347 | 'release.yml': {'release': RELEASE_RUNNER, 'prebuilt': HOSTED_MATRIX_RUNNER, |
347 | 348 | '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}, |
350 | 351 | } |
351 | 352 | # Credential-bearing jobs outside the release pins and gated docs build retain |
352 | 353 | # standard hosted labels. Existing hosted exceptions above are pinned separately. |
@@ -2351,7 +2352,7 @@ def _authz_header(name: str) -> str: |
2351 | 2352 | _GKE_SCALE_LABEL = re.compile( |
2352 | 2353 | r'(?<![\w.-])gke-\d+cpu-\d+gb-(?:amd64|arm64)(?:-(?:128|256)gb)?(?![\w.-])') |
2353 | 2354 | _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)?') |
2355 | 2356 |
|
2356 | 2357 |
|
2357 | 2358 | 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: |
2571 | 2572 |
|
2572 | 2573 | # Disk suffixes still require group membership; admitted sizes are pinned separately. |
2573 | 2574 | _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.-])', |
2575 | 2576 | re.IGNORECASE) |
2576 | 2577 | _REPOSITORY_ID = r'[A-Za-z0-9][A-Za-z0-9_.-]*/[A-Za-z0-9][A-Za-z0-9_.-]*' |
2577 | 2578 | _RUNNER_GROUP_REFERENCE = re.compile( |
|
0 commit comments