Skip to content

Commit 3080b40

Browse files
committed
ci: retain native-x86 allowlist expectations after #742 merge
Keep the merge head's on-demand post-merge labels while retaining the spot native-x86 job added by #742. Include the spot label in the post-sized mirror expectations and in the actionlint runner-site map for ci-post.yml. This closes the exact preflight finding on 41f08d2 without changing workflow labels or weakening the runner allowlist.
1 parent 41f08d2 commit 3080b40

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

‎scripts/test_ci_preflight.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4164,7 +4164,7 @@ def test_post_sized_labels_need_exact_ref(self):
41644164
self.assertCountEqual(self.failures(lines), [
41654165
self.missing('ci-post.yml', label)
41664166
for label in (GKE_2, GKE_8, GKE_16, GKE_16_128,
4167-
GKE_ONDEMAND_32, GKE_ONDEMAND_32_256,
4167+
GKE_32, GKE_ONDEMAND_32, GKE_ONDEMAND_32_256,
41684168
GKE_ARM)])
41694169

41704170
def test_matrix_include_and_axis_resolve_the_runner_in_a_real_workflow(self):
@@ -9821,7 +9821,8 @@ def test_actionlint_runner_labels_rejects_removed_label(self):
98219821
(GKP_2, (('release-ruleset-probe.yml', 'probe'), ('promote-baseline.yml', 'promote'))),
98229822
(GKP_OD_4, (('release.yml', 'release'), ('release.yml', 'notify-hub'))),
98239823
(GKP_OD_PREBUILT, (('release.yml', 'prebuilt'),)),
9824-
('gke-32cpu-64gb-amd64', (('gke-pr.yml', 'build'),)),
9824+
('gke-32cpu-64gb-amd64', (('gke-pr.yml', 'build'),
9825+
('ci-post.yml', NATIVE_X86_JOB))),
98259826
('gke-ondemand-32cpu-64gb-amd64', (('ci-post.yml', 'build'),)),
98269827
('gke-ondemand-32cpu-64gb-amd64-256gb', (('ci-post.yml', 'sanitizers'),)),
98279828
('gke-16cpu-32gb-amd64', (('ci-post.yml', 'kernel-only'), ('corpus-parity.yml', 'corpus-parity'))),

0 commit comments

Comments
 (0)