Repository navigation
ci: let a variable choose every workflow's runner #7975
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ permissions: {} | |
|
|
||
| jobs: | ||
| fail: | ||
| runs-on: ${{ vars.RUNNER_PREVENT_MASTER_PR || 'ubuntu-latest' }} | ||
| steps: | ||
| - run: exit 1 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,11 @@ | |
| # Prefixes — any label starting with one of these indicates a non-GitHub-hosted runner | ||
| NON_GITHUB_HOSTED_RUNNER_PREFIXES = ("blacksmith-",) | ||
| SELF_HOSTED_LABEL = "self-hosted" | ||
| # GitHub's own runner image labels, such as ubuntu-24.04, ubuntu-24.04-arm, | ||
| # ubuntu-latest or windows-11-arm. A bare label like ubuntu-core does not match. | ||
| GITHUB_HOSTED_IMAGE_LABEL = re.compile( | ||
| r"(ubuntu|windows|macos)-(latest|slim|\d[\d.]*)(-[a-z0-9]+)*", re.IGNORECASE | ||
| ) | ||
| # Any queued GitHub-hosted job at all is enough to prefer our own hardware for | ||
| # the arm64 pre-lint jobs. | ||
| SELFHOSTED_BACKLOG_THRESHOLD = 0 | ||
|
|
@@ -336,28 +341,30 @@ def select_tier_runner( | |
| selfhosted_label: str, | ||
| selfhosted_queued: int, | ||
| selfhosted_queue_limit: int, | ||
| default_runner: str, | ||
| blacksmith_runner: str, | ||
| label_override: bool, | ||
| measurement_error: Optional[str], | ||
| disabled_reason: str, | ||
| ) -> Tuple[str, str]: | ||
| """Pick an amd64 tier's runner: default, then self-hosted, then Blacksmith. | ||
|
|
||
| default_runner is RUNNER_DEFAULT_AMD64, GitHub-hosted unless set. Runs | ||
| that may not use our own hardware stay on it, so Blacksmith is only ever | ||
| paid for trusted runs or an explicit blacksmith-ci label. | ||
| blacksmith_runner is default_runner when RUNNER_AMD64 is unset. | ||
| """ | ||
| if label_override: | ||
| return blacksmith_runner, "label:blacksmith-ci" | ||
|
|
||
| if measurement_error is not None: | ||
| return default_runner, "metric-unavailable" | ||
|
|
||
| if hosted_available: | ||
| return default_runner, hosted_reason | ||
|
|
||
| if not allowed: | ||
| return default_runner, "actor-not-allowed" | ||
|
|
||
| if not selfhosted_label: | ||
| return blacksmith_runner, disabled_reason | ||
|
|
@@ -390,6 +397,8 @@ def select_runners( | |
| runner_selfhosted_build_var: str = "", | ||
| build_hosted_queue_limit: int = DEFAULT_BUILD_HOSTED_QUEUE_LIMIT, | ||
| build_selfhosted_queue_limit: int = DEFAULT_BUILD_SELFHOSTED_QUEUE_LIMIT, | ||
| runner_default_amd64_var: str = "", | ||
| runner_default_arm64_var: str = "", | ||
| ) -> Dict[str, str]: | ||
| label_names = [ | ||
| label.get("name", "") | ||
|
|
@@ -404,6 +413,14 @@ def select_runners( | |
| selfhosted_queued: Dict[str, int] = {} | ||
| measurement_error = None | ||
|
|
||
| # A default runner set to a label other than one of GitHub's images names | ||
| # our own hardware, so its queued jobs must not count towards the backlog. | ||
| moved_default_labels = tuple( | ||
| label | ||
| for label in (runner_default_amd64_var, runner_default_arm64_var) | ||
| if label and not GITHUB_HOSTED_IMAGE_LABEL.fullmatch(label) | ||
| ) | ||
|
Comment on lines
+418
to
+422
Collaborator
There was a problem hiding this comment.
🔴 Blocking: Keep alternate GitHub-hosted defaults in the backlog count Changing the default label does not necessarily move jobs off GitHub-hosted capacity. Setting RUNNER_DEFAULT_AMD64 to ubuntu-latest or ubuntu-22.04 adds that hosted label to moved_default_labels, which is passed to targets_github_hosted_runner() as an unconditional non-hosted exclusion. With 40 queued jobs carrying that label and no other hosted jobs queued, backlog_count becomes 0 instead of 40: both amd64 tiers stay on the congested default, and neither architecture crosses its configured backlog-escalation threshold. The exclusion also applies to unrelated jobs using the same label across every scanned repository. The documented intent to exclude custom hardware is valid, but label inequality does not establish hosting type. Preserve alternate GitHub-hosted labels in the classification logic while retaining the custom-runner exclusion, and extend the existing backlog scenario to cover both cases. source:
Member
Author
There was a problem hiding this comment. Agreed, fixed in 6ee0034. Changing the default no longer counts as moving it off GitHub-hosted on its own. A default is excluded from the backlog only when it isn't one of GitHub's image labels ( The backlog scenario now also covers a moved arm64 default (31 queued, backlog 0) and an alternate GitHub image default ( 🤖 Posted autonomously by Claude on behalf of pasta.
Collaborator
There was a problem hiding this comment. Resolved (re-reviewed at |
||
|
|
||
| try: | ||
| backlog_count_value, selfhosted_queued = count_queued_jobs( | ||
| fetch_json, | ||
|
|
@@ -412,7 +429,7 @@ def select_runners( | |
| runner_selfhosted_arm64_var, | ||
| runner_selfhosted_fast_var, | ||
| runner_selfhosted_build_var, | ||
| ) + moved_default_labels, | ||
| ) | ||
| backlog_count = str(backlog_count_value) | ||
| except Exception as exc: # noqa: BLE001 | ||
|
|
@@ -447,21 +464,22 @@ def select_runners( | |
| measurement_error is None and backlog_count_value > arm64_threshold | ||
| ) | ||
|
|
||
| default_amd64 = runner_default_amd64_var or DEFAULT_RUNNER_AMD64 | ||
| runner_amd64 = default_amd64 | ||
| runner_arm64 = runner_default_arm64_var or DEFAULT_RUNNER_ARM64 | ||
| fallback_parts: List[str] = [] | ||
|
|
||
| if use_blacksmith_amd64: | ||
| if runner_amd64_var: | ||
| runner_amd64 = runner_amd64_var | ||
| else: | ||
| fallback_parts.append("amd64-default-fallback") | ||
|
|
||
| if use_blacksmith_arm64: | ||
| if runner_arm64_var: | ||
| runner_arm64 = runner_arm64_var | ||
| else: | ||
| fallback_parts.append("arm64-default-fallback") | ||
|
|
||
| if measurement_error is not None: | ||
| decision_parts.append("error:{}".format(measurement_error[:180])) | ||
|
|
@@ -499,7 +517,7 @@ def selfhosted( | |
| ) | ||
|
|
||
| trusted = is_amd64_selfhosted_allowed(event_name, event, actor, allowed_authors) | ||
| blacksmith_amd64 = runner_amd64_var or default_amd64 | ||
|
|
||
| def tier( | ||
| hosted_available: bool, | ||
|
|
@@ -515,6 +533,7 @@ def tier( | |
| selfhosted_label=selfhosted_label, | ||
| selfhosted_queued=selfhosted_queued.get(selfhosted_label.lower(), 0), | ||
| selfhosted_queue_limit=queue_limit, | ||
| default_runner=default_amd64, | ||
| blacksmith_runner=blacksmith_amd64, | ||
| label_override=label_override, | ||
| measurement_error=measurement_error, | ||
|
|
@@ -646,6 +665,16 @@ def parse_args(argv: Sequence[str]) -> argparse.Namespace: | |
| default=env_int("BACKLOG_THRESHOLD_ARM64", default_backlog_threshold * 3), | ||
| help="Queued job threshold for switching arm64 jobs to Blacksmith", | ||
| ) | ||
| parser.add_argument( | ||
| "--runner-default-amd64-var", | ||
| default=os.environ.get("RUNNER_DEFAULT_AMD64_VAR", ""), | ||
| help="amd64 runner label used without escalation; empty means {}".format(DEFAULT_RUNNER_AMD64), | ||
| ) | ||
| parser.add_argument( | ||
| "--runner-default-arm64-var", | ||
| default=os.environ.get("RUNNER_DEFAULT_ARM64_VAR", ""), | ||
| help="arm64 runner label used without escalation; empty means {}".format(DEFAULT_RUNNER_ARM64), | ||
| ) | ||
| parser.add_argument( | ||
| "--runner-amd64-var", | ||
| default=os.environ.get("RUNNER_AMD64_VAR", ""), | ||
|
|
@@ -756,6 +785,8 @@ def main(argv: Sequence[str]) -> int: | |
| runner_selfhosted_build_var=args.runner_selfhosted_build_var, | ||
| build_hosted_queue_limit=args.build_hosted_queue_limit, | ||
| build_selfhosted_queue_limit=args.build_selfhosted_queue_limit, | ||
| runner_default_amd64_var=args.runner_default_amd64_var, | ||
| runner_default_arm64_var=args.runner_default_arm64_var, | ||
| ) | ||
|
|
||
| write_github_output(os.environ.get("GITHUB_OUTPUT"), outputs) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.