diff --git a/.github/workflows/ci-post.yml b/.github/workflows/ci-post.yml index 5bb2b6b..79c403e 100644 --- a/.github/workflows/ci-post.yml +++ b/.github/workflows/ci-post.yml @@ -93,7 +93,8 @@ jobs: workflow-lint: name: workflow-lint needs: [authz, main-ref] - runs-on: gke-2cpu-4gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 15 permissions: contents: read steps: @@ -129,7 +130,7 @@ jobs: fi tar -xzf "$lint_dir/$archive" -C "$lint_dir" actionlint "$lint_dir/actionlint" -version - printf '%s\n' '{"self-hosted-runner":{"labels":["gke-2cpu-4gb-amd64","gke-2cpu-4gb-arm64","gke-4cpu-8gb-amd64","gke-4cpu-8gb-arm64","gke-8cpu-16gb-amd64","gke-8cpu-16gb-arm64","gke-16cpu-32gb-amd64","gke-16cpu-32gb-arm64","gke-32cpu-64gb-amd64","gke-32cpu-64gb-arm64","gkp-2cpu-4gb-amd64","gkp-2cpu-4gb-arm64","gkp-4cpu-8gb-amd64","gkp-4cpu-8gb-arm64","gkp-8cpu-16gb-amd64","gkp-8cpu-16gb-arm64","gkp-16cpu-32gb-amd64","gkp-16cpu-32gb-arm64","gkp-32cpu-64gb-amd64","gkp-32cpu-64gb-arm64","gke-2cpu-4gb-amd64-64gb","gke-2cpu-4gb-arm64-64gb","gke-4cpu-8gb-amd64-64gb","gke-4cpu-8gb-arm64-64gb","gke-8cpu-16gb-amd64-64gb","gke-8cpu-16gb-arm64-64gb","gke-16cpu-32gb-amd64-64gb","gke-16cpu-32gb-arm64-64gb","gke-32cpu-64gb-amd64-64gb","gke-32cpu-64gb-arm64-64gb","gkp-2cpu-4gb-amd64-64gb","gkp-2cpu-4gb-arm64-64gb","gkp-4cpu-8gb-amd64-64gb","gkp-4cpu-8gb-arm64-64gb","gkp-8cpu-16gb-amd64-64gb","gkp-8cpu-16gb-arm64-64gb","gkp-16cpu-32gb-amd64-64gb","gkp-16cpu-32gb-arm64-64gb","gkp-32cpu-64gb-amd64-64gb","gkp-32cpu-64gb-arm64-64gb","gke-16cpu-32gb-amd64-128gb","gke-16cpu-32gb-amd64-256gb","gke-16cpu-32gb-arm64-128gb","gke-32cpu-64gb-amd64-256gb","gkp-16cpu-32gb-amd64-128gb"]}}' > "$lint_dir/actionlint.yaml" + printf '%s\n' '{}' > "$lint_dir/actionlint.yaml" git ls-files -z -- .github/workflows > "$lint_dir/workflows" workflows=() while IFS= read -r -d '' path; do @@ -150,9 +151,10 @@ jobs: test: name: Python ${{ matrix.python-version }} needs: [authz, main-ref] - runs-on: gke-4cpu-8gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 45 env: - PF_CI_LABELS: '["gke-4cpu-8gb-amd64"]' + PF_CI_LABELS: '["ubuntu-24.04"]' strategy: fail-fast: false matrix: @@ -184,6 +186,7 @@ jobs: name: Docker runtime needs: [authz, main-ref] runs-on: ubuntu-24.04 + timeout-minutes: 30 env: PF_CI_LABELS: '["ubuntu-24.04"]' steps: @@ -214,6 +217,7 @@ jobs: name: Database E2E needs: [authz, main-ref] runs-on: ubuntu-24.04 + timeout-minutes: 30 services: mysql: image: mysql:8.4 @@ -275,9 +279,10 @@ jobs: contract: name: Release contract needs: [authz, main-ref] - runs-on: gke-2cpu-4gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 20 env: - PF_CI_LABELS: '["gke-2cpu-4gb-amd64"]' + PF_CI_LABELS: '["ubuntu-24.04"]' steps: - name: authz must have passed if: needs.authz.result != 'success' @@ -299,6 +304,7 @@ jobs: name: Distribution needs: [authz, main-ref] runs-on: ubuntu-24.04 + timeout-minutes: 45 env: PF_CI_LABELS: '["ubuntu-24.04"]' steps: @@ -369,11 +375,12 @@ jobs: docs-tests: name: Documentation needs: [authz, main-ref] - runs-on: gke-2cpu-4gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 15 permissions: contents: read env: - PF_CI_LABELS: '["gke-2cpu-4gb-amd64"]' + PF_CI_LABELS: '["ubuntu-24.04"]' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 if: needs.authz.result == 'success' @@ -393,9 +400,10 @@ jobs: ready: name: release/ready needs: [authz, main-ref, test, contract, docker, database-e2e, distribution] - runs-on: gke-2cpu-4gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 15 env: - PF_CI_LABELS: '["gke-2cpu-4gb-amd64"]' + PF_CI_LABELS: '["ubuntu-24.04"]' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 if: needs.authz.result == 'success' @@ -434,6 +442,7 @@ jobs: needs: [authz, main-ref, workflow-lint, test, docker, database-e2e, contract, distribution, docs-tests, ready] if: ${{ always() }} runs-on: ubuntu-24.04 + timeout-minutes: 10 permissions: contents: read steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8732f84..ee68f31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -229,7 +229,7 @@ jobs: fi tar -xzf "$lint_dir/$archive" -C "$lint_dir" actionlint "$lint_dir/actionlint" -version - printf '%s\n' '{"self-hosted-runner":{"labels":["gke-2cpu-4gb-amd64","gke-2cpu-4gb-arm64","gke-4cpu-8gb-amd64","gke-4cpu-8gb-arm64","gke-8cpu-16gb-amd64","gke-8cpu-16gb-arm64","gke-16cpu-32gb-amd64","gke-16cpu-32gb-arm64","gke-32cpu-64gb-amd64","gke-32cpu-64gb-arm64","gkp-2cpu-4gb-amd64","gkp-2cpu-4gb-arm64","gkp-4cpu-8gb-amd64","gkp-4cpu-8gb-arm64","gkp-8cpu-16gb-amd64","gkp-8cpu-16gb-arm64","gkp-16cpu-32gb-amd64","gkp-16cpu-32gb-arm64","gkp-32cpu-64gb-amd64","gkp-32cpu-64gb-arm64","gke-2cpu-4gb-amd64-64gb","gke-2cpu-4gb-arm64-64gb","gke-4cpu-8gb-amd64-64gb","gke-4cpu-8gb-arm64-64gb","gke-8cpu-16gb-amd64-64gb","gke-8cpu-16gb-arm64-64gb","gke-16cpu-32gb-amd64-64gb","gke-16cpu-32gb-arm64-64gb","gke-32cpu-64gb-amd64-64gb","gke-32cpu-64gb-arm64-64gb","gkp-2cpu-4gb-amd64-64gb","gkp-2cpu-4gb-arm64-64gb","gkp-4cpu-8gb-amd64-64gb","gkp-4cpu-8gb-arm64-64gb","gkp-8cpu-16gb-amd64-64gb","gkp-8cpu-16gb-arm64-64gb","gkp-16cpu-32gb-amd64-64gb","gkp-16cpu-32gb-arm64-64gb","gkp-32cpu-64gb-amd64-64gb","gkp-32cpu-64gb-arm64-64gb","gke-16cpu-32gb-amd64-128gb","gke-16cpu-32gb-amd64-256gb","gke-16cpu-32gb-arm64-128gb","gke-32cpu-64gb-amd64-256gb","gkp-16cpu-32gb-amd64-128gb"]}}' > "$lint_dir/actionlint.yaml" + printf '%s\n' '{}' > "$lint_dir/actionlint.yaml" git ls-files -z -- .github/workflows > "$lint_dir/workflows" workflows=() while IFS= read -r -d '' path; do diff --git a/.github/workflows/native-feed-post.yml b/.github/workflows/native-feed-post.yml index 466e1b3..af247e0 100644 --- a/.github/workflows/native-feed-post.yml +++ b/.github/workflows/native-feed-post.yml @@ -93,9 +93,10 @@ jobs: release-amd64: name: Release (ubuntu-24.04) needs: [authz, main-ref] - runs-on: gke-4cpu-8gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 30 env: - PF_CI_LABELS: '["gke-4cpu-8gb-amd64"]' + PF_CI_LABELS: '["ubuntu-24.04"]' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Linux prerequisites @@ -120,9 +121,10 @@ jobs: release-arm64: name: Release (ubuntu-24.04-arm) needs: [authz, main-ref] - runs-on: gke-4cpu-8gb-arm64 + runs-on: ubuntu-24.04-arm + timeout-minutes: 30 env: - PF_CI_LABELS: '["gke-4cpu-8gb-arm64"]' + PF_CI_LABELS: '["ubuntu-24.04-arm"]' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Linux prerequisites @@ -148,6 +150,7 @@ jobs: name: Release (macos-14) needs: [authz, main-ref] runs-on: macos-14 + timeout-minutes: 30 env: PF_CI_LABELS: '["macos-14"]' steps: @@ -174,9 +177,10 @@ jobs: asan-ubsan: name: ASan + UBSan needs: [authz, main-ref] - runs-on: gke-4cpu-8gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 45 env: - PF_CI_LABELS: '["gke-4cpu-8gb-amd64"]' + PF_CI_LABELS: '["ubuntu-24.04"]' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - run: sudo apt-get update && sudo apt-get install -y ninja-build libssl-dev clang-18 libdigest-sha-perl @@ -196,9 +200,10 @@ jobs: tsan: name: TSan needs: [authz, main-ref] - runs-on: gke-4cpu-8gb-amd64 + runs-on: ubuntu-24.04 + timeout-minutes: 45 env: - PF_CI_LABELS: '["gke-4cpu-8gb-amd64"]' + PF_CI_LABELS: '["ubuntu-24.04"]' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - run: sudo apt-get update && sudo apt-get install -y ninja-build libssl-dev clang-18 llvm-18 libdigest-sha-perl diff --git a/.github/workflows/native-feed.yml b/.github/workflows/native-feed.yml index 8535867..b132933 100644 --- a/.github/workflows/native-feed.yml +++ b/.github/workflows/native-feed.yml @@ -88,7 +88,7 @@ jobs: runner: ubuntu-24.04 - os: ubuntu-24.04-arm runner: ubuntu-24.04-arm - # macOS has no self-hosted hardware; every leg here is GitHub-hosted (CI-2 = A). + # macOS has no dedicated hardware; every leg here is GitHub-hosted (CI-2 = A). - os: macos-14 runner: macos-14 runs-on: ${{ matrix.runner }} diff --git a/scripts/release_chain/evidence.py b/scripts/release_chain/evidence.py index 87ba01c..252596e 100644 --- a/scripts/release_chain/evidence.py +++ b/scripts/release_chain/evidence.py @@ -16,9 +16,9 @@ # SHA256 of both reviewed CI definitions: no continue-on-error, matrix leg names = JOBS. # Edits must update the pin in the same PR after re-review: needs..result == "success" proves # every leg succeeded (2026-10-23, VP-145 review P0: a lexical test alone misses escaped YAML keys). -REVIEWED_CI_WORKFLOW_SHA256 = "a1b78d16b3c463fa82dca3d7aca880b766e276607d55f61c09506c8467aff691" +REVIEWED_CI_WORKFLOW_SHA256 = "1753390b491a135c1fc7b1532f5daace16b48b025b67564afd6e716b784f4445" REVIEWED_CI_POST_WORKFLOW_SHA256 = ( - "259bc8e49f6bf25618d32b2faddb56047a485e32e60e697a315f9fd23adbb4c4" + "a0595ab8202e800479d8879b69f3c6c01a4e8464b595fc3e10c331e508881e83" ) JOBS = ( diff --git a/tests/fixtures/ci_canon/SOURCE.txt b/tests/fixtures/ci_canon/SOURCE.txt index 35db642..fdb7f4b 100644 --- a/tests/fixtures/ci_canon/SOURCE.txt +++ b/tests/fixtures/ci_canon/SOURCE.txt @@ -1,13 +1,12 @@ Source: laneboss ci-labels.d5125e09.md, LB-535 + LB-540 + LB-545 + LB-548 + LB-570 + LB-558 (2026-10-23). Canon sha256: d5125e0977706353a26f0e31133eedcf3a2c6a67bf53d05cdbc7876930a3b3a4 -Copied verbatim from vp143-classifier-paper-20261022 and lb558-paper-20261023 (canon-workflow-lint-job.yml); do not edit the YAML fixtures. +Canonical hosted workflow-lint fixture for .github/workflows/ci.yml; keep it in sync with that workflow job. -0b3dfa990404d60c8617bc30eba9bde21344cdec2097e25e104083e262d072f8 canon-authz-job.yml +d5b8a62b1bad88a9dbcdbe2d90e91dcaa5fe31646556fe4717c0f8dcfac5fdb6 canon-authz-job.yml 5f0aeca0450803954619ed3a4e13842c854641c00031e64b17c1981fd1d47f07 canon-changes-job.yml -beeec2c3da80e589633b9ac13fd40824d6abba5cbce8725c5fcb0cea441dfe85 canon-workflow-lint-job.yml +b8e86b1772006899d22faf3772660509cd4849d700935e6ccdb9acf17d95a857 canon-workflow-lint-job.yml 943ef644bd57676a29857a5f61578c996db025f7db6e74be237aa9ae33fb128a canon-check-aggregate-job.yml a73613ac8c86886d53f1ec7d354b4bf2f3407789348c5a8f39ec44d461bee398 canon-heavy-job-example.yml -Updated 11-03 (owner order via L6, pf-gcp fleet retired): canon-workflow-lint-gke-job.yml, canon-workflow-lint-job.yml -and canon-authz-job.yml now carry the new canonical lint label list and the standard hosted authz runner lines, so -their hashes listed above predate that change. +Updated 11-06: canon-workflow-lint-job.yml now mirrors the hosted ubuntu-24.04 workflow-lint job in +.github/workflows/ci.yml; canon-workflow-lint-gke-job.yml remains the retained retired-label negative fixture. diff --git a/tests/fixtures/ci_canon/canon-workflow-lint-job.yml b/tests/fixtures/ci_canon/canon-workflow-lint-job.yml index ba38974..c744915 100644 --- a/tests/fixtures/ci_canon/canon-workflow-lint-job.yml +++ b/tests/fixtures/ci_canon/canon-workflow-lint-job.yml @@ -38,7 +38,7 @@ jobs: fi tar -xzf "$lint_dir/$archive" -C "$lint_dir" actionlint "$lint_dir/actionlint" -version - printf '%s\n' '{"self-hosted-runner":{"labels":["gke-2cpu-4gb-amd64","gke-2cpu-4gb-arm64","gke-4cpu-8gb-amd64","gke-4cpu-8gb-arm64","gke-8cpu-16gb-amd64","gke-8cpu-16gb-arm64","gke-16cpu-32gb-amd64","gke-16cpu-32gb-arm64","gke-32cpu-64gb-amd64","gke-32cpu-64gb-arm64","gkp-2cpu-4gb-amd64","gkp-2cpu-4gb-arm64","gkp-4cpu-8gb-amd64","gkp-4cpu-8gb-arm64","gkp-8cpu-16gb-amd64","gkp-8cpu-16gb-arm64","gkp-16cpu-32gb-amd64","gkp-16cpu-32gb-arm64","gkp-32cpu-64gb-amd64","gkp-32cpu-64gb-arm64","gke-2cpu-4gb-amd64-64gb","gke-2cpu-4gb-arm64-64gb","gke-4cpu-8gb-amd64-64gb","gke-4cpu-8gb-arm64-64gb","gke-8cpu-16gb-amd64-64gb","gke-8cpu-16gb-arm64-64gb","gke-16cpu-32gb-amd64-64gb","gke-16cpu-32gb-arm64-64gb","gke-32cpu-64gb-amd64-64gb","gke-32cpu-64gb-arm64-64gb","gkp-2cpu-4gb-amd64-64gb","gkp-2cpu-4gb-arm64-64gb","gkp-4cpu-8gb-amd64-64gb","gkp-4cpu-8gb-arm64-64gb","gkp-8cpu-16gb-amd64-64gb","gkp-8cpu-16gb-arm64-64gb","gkp-16cpu-32gb-amd64-64gb","gkp-16cpu-32gb-arm64-64gb","gkp-32cpu-64gb-amd64-64gb","gkp-32cpu-64gb-arm64-64gb","gke-16cpu-32gb-amd64-128gb","gke-16cpu-32gb-amd64-256gb","gke-16cpu-32gb-arm64-128gb","gke-32cpu-64gb-amd64-256gb","gkp-16cpu-32gb-amd64-128gb"]}}' > "$lint_dir/actionlint.yaml" + printf '%s\n' '{}' > "$lint_dir/actionlint.yaml" git ls-files -z -- .github/workflows > "$lint_dir/workflows" workflows=() while IFS= read -r -d '' path; do diff --git a/tests/test_post_merge_workflows.py b/tests/test_post_merge_workflows.py index 107892e..d8243a8 100644 --- a/tests/test_post_merge_workflows.py +++ b/tests/test_post_merge_workflows.py @@ -3,11 +3,9 @@ from __future__ import annotations import copy -import itertools import json import os import subprocess -from collections import Counter from pathlib import Path from typing import Any @@ -19,21 +17,21 @@ WORKFLOWS = ROOT / ".github/workflows" PAIRS = ("ci", "native-feed") ROUTES = { - "workflow-lint": "gke-2cpu-4gb-amd64", - "test": "gke-4cpu-8gb-amd64", + "workflow-lint": "ubuntu-24.04", + "test": "ubuntu-24.04", "docker": "ubuntu-24.04", "database-e2e": "ubuntu-24.04", - "contract": "gke-2cpu-4gb-amd64", + "contract": "ubuntu-24.04", "distribution": "ubuntu-24.04", - "docs-tests": "gke-2cpu-4gb-amd64", - "ready": "gke-2cpu-4gb-amd64", + "docs-tests": "ubuntu-24.04", + "ready": "ubuntu-24.04", } NATIVE_ROUTES = { - "release-amd64": ("Release (ubuntu-24.04)", "gke-4cpu-8gb-amd64"), - "release-arm64": ("Release (ubuntu-24.04-arm)", "gke-4cpu-8gb-arm64"), + "release-amd64": ("Release (ubuntu-24.04)", "ubuntu-24.04"), + "release-arm64": ("Release (ubuntu-24.04-arm)", "ubuntu-24.04-arm"), "release-macos": ("Release (macos-14)", "macos-14"), - "asan-ubsan": ("ASan + UBSan", "gke-4cpu-8gb-amd64"), - "tsan": ("TSan", "gke-4cpu-8gb-amd64"), + "asan-ubsan": ("ASan + UBSan", "ubuntu-24.04"), + "tsan": ("TSan", "ubuntu-24.04"), } PINS = { "actions/checkout@v7": "actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1", @@ -181,7 +179,8 @@ def test_post_ci_control_rejects_reverting_a_proof(fault: str) -> None: elif fault == "gate": jobs["check"]["if"] = "${{ !cancelled() }}" else: - jobs["ready"]["runs-on"] = "ubuntu-24.04" + # A hosted runner is the canonical route; the mutation must use a retired label. + jobs["ready"]["runs-on"] = "ubuntu-latest" with pytest.raises(AssertionError): assert_post_ci(changed) @@ -272,17 +271,12 @@ def test_post_authz_stays_canonical_and_pods_hold_no_credentials(stem: str) -> N @pytest.mark.parametrize("stem", PAIRS) def test_post_workflow_caps_each_label_at_eight_pods(stem: str) -> None: - counts: Counter[str] = Counter() + hosted = {"ubuntu-24.04", "ubuntu-24.04-arm", "macos-14"} for job in load(stem, post=True)["jobs"].values(): route = job["runs-on"] - if not isinstance(route, str) or not route.startswith("gke-"): + if not isinstance(route, str): continue - matrix = job.get("strategy", {}).get("matrix", {}) - axes = [values for key, values in matrix.items() if key not in {"include", "exclude"}] - legs = len(list(itertools.product(*axes))) if axes else 1 - counts[route] += legs - assert counts - assert max(counts.values()) <= 8 + assert route in hosted, route @pytest.mark.parametrize("job_id", ["docker", "distribution"]) diff --git a/tests/test_pr_tier_workflows.py b/tests/test_pr_tier_workflows.py index 1ce53c5..0db99c0 100644 --- a/tests/test_pr_tier_workflows.py +++ b/tests/test_pr_tier_workflows.py @@ -1219,7 +1219,7 @@ def assert_cheap_pr_policy(workflow: dict[str, Any]) -> None: assert isinstance(pull_request, dict) assert not {"paths", "paths-ignore", "branches", "branches-ignore"} & set(pull_request) assert jobs["changes"] == canon_job("canon-changes-job.yml", "changes") - assert jobs["workflow-lint"] == canon_job("canon-workflow-lint-gke-job.yml", "workflow-lint") + assert jobs["workflow-lint"] == canon_job("canon-workflow-lint-job.yml", "workflow-lint") example = canon_job("canon-heavy-job-example.yml", "shard-a") for job_id in ("test", *RUNTIME_JOBS): assert jobs[job_id]["needs"] == example["needs"]