ci/cd: prod/dev labels fix

Author: pragmaxim

.github/scripts/build_plan.py

@@ -7,6 +7,7 @@
 from runner import (
     PRODUCTION_RUNNER,
     ValidationError,
+    build_runner_labels,
     fail,
     load_coin_context,
     log,
@@ -44,6 +45,7 @@ def main() -> None:
                 "runner": runner,
                 "coins": coins,
                 "coins_csv": ",".join(coins),
+                "labels_json": json.dumps(build_runner_labels(runner, build_env), separators=(",", ":")),
             }
         )
 
@@ -60,7 +62,10 @@ def main() -> None:
         log("Skipped prod-only coins for env=dev: " + ", ".join(selection.skipped_prod_only))
     log("Selected coins: " + ", ".join(selection.coins))
     for item in runner_matrix:
-        log(f"Runner {item['runner']}: {', '.join(item['coins'])}")
+        log(
+            f"Runner {item['runner']} labels={item['labels_json']}: "
+            + ", ".join(item["coins"])
+        )
 
 
 if __name__ == "__main__":

.github/scripts/run.py

@@ -322,7 +322,7 @@ def create_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.Argumen
         description=(
             "Build Debian packages only.\n"
             "- env=dev uses BB_RUNNER_* mapping and ALL skips prod-only coins\n"
-            "- env=prod builds selected coins on production_builder"
+            "- env=prod builds selected coins on the production-builder runner"
         ),
     )
     add_common_workflow_args(build_parser)

.github/scripts/runner.py

@@ -7,6 +7,7 @@
 from pathlib import Path
 
 PRODUCTION_RUNNER = "production_builder"
+PRODUCTION_RUNNER_LABEL = "production-builder"
 LOG_PREFIX = "CI/CD Pipeline:"
 
 
@@ -136,6 +137,12 @@ def is_production_only_runner(runner: str) -> bool:
     return runner == PRODUCTION_RUNNER
 
 
+def build_runner_labels(runner: str, build_env: str) -> list[str]:
+    if build_env == "prod":
+        return ["self-hosted", PRODUCTION_RUNNER_LABEL]
+    return ["self-hosted", "bb-dev-selfhosted", runner]
+
+
 def coin_config_path(workspace: Path, coin: str) -> Path:
     return workspace / "configs" / "coins" / f"{coin}.json"
 

.github/workflows/deploy.yml

@@ -105,7 +105,7 @@ jobs:
       fail-fast: false
       matrix:
         include: ${{ fromJSON(needs.prepare_build.outputs.runner_matrix || '[]') }}
-    runs-on: [self-hosted, bb-dev-selfhosted, "${{ matrix.runner }}"]
+    runs-on: ${{ fromJSON(matrix.labels_json) }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

docs/ci_cd.md

@@ -47,7 +47,7 @@ Inputs:
     4. run post-deploy e2e tests
 - `env`:
   - `dev` keeps the current per-coin dev runner mapping
-  - `prod` builds selected coins on `production_builder` regardless of `BB_RUNNER_*`
+  - `prod` builds selected coins on the `production-builder` runner regardless of `BB_RUNNER_*`
   - default is `dev`
   - ignored when `mode=deploy`
 - `always_build_backend`:
@@ -77,7 +77,7 @@ See also [CI/CD workflow variables](env.md#cicd-workflow-variables).
 Special cases:
 
 - `mode=build` + `env=dev` skips prod-only coins when `coins=ALL`
-- `mode=build` + `env=prod` + `coins=ALL` builds all configured coins with `BB_RUNNER_*` mappings on `production_builder`
+- `mode=build` + `env=prod` + `coins=ALL` builds all configured coins with `BB_RUNNER_*` mappings on the `production-builder` runner
 - `mode=build` + `env=dev` fails if you explicitly request a coin whose `BB_RUNNER_*` is `production_builder`
 - `mode=deploy` is dev-only and fails fast if any selected coin is mapped to `production_builder`
 

docs/env.md

@@ -33,7 +33,7 @@ Some behavior of Blockbook can be modified by environment variables. The variabl
 ## CI/CD workflow variables
 
 -   `BB_RUNNER_<coin>` - Maps a workflow/config coin name from `configs/coins/<coin>.json` to the self-hosted runner label
-    used by the `Build / Deploy` workflow. `production_builder` marks coins that are buildable only in `env=prod`.
+    used by the `Build / Deploy` workflow. `production_builder` marks coins that are buildable only in `env=prod`; those builds run on the `production-builder` self-hosted runner label.
 
 -   `BB_PACKAGE_ROOT` - Absolute filesystem path where workflow build jobs stage copied `.deb` packages after build.
     Defaults to `/opt/blockbook-builds` in the workflow.