Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-04 03:01:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quick and dirty linkal repo integration

Browse source
This commit is contained in:
Julien Malka 2023-01-28 02:19:42 +01:00
parent b61c996c30
commit 10e1a96f35
Signed by: Luj
GPG key ID: 6FC74C847011FD83
2 changed files with 58 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/buildbot/buildbot_nix.py
View file

@ -58,7 +58,7 @@ class BuildTrigger(Trigger):
build_props.setProperty(f"{attr}-drv_path", drv_path, "nix-eval") build_props.setProperty(f"{attr}-drv_path", drv_path, "nix-eval")
props = Properties() props = Properties()
props.setProperty("virtual_builder_name", name, "nix-eval") props.setProperty("virtual_builder_name", name, "jobs evaluation")
props.setProperty("virtual_builder_tags", "", "nix-eval") props.setProperty("virtual_builder_tags", "", "nix-eval")
props.setProperty("attr", attr, "nix-eval") props.setProperty("attr", attr, "nix-eval")
props.setProperty("drv_path", drv_path, "nix-eval") props.setProperty("drv_path", drv_path, "nix-eval")
@ -205,6 +205,7 @@ class CreatePr(steps.ShellCommand):
def nix_update_flake_config( def nix_update_flake_config(
worker_names: list[str], worker_names: list[str],
repo: str,
projectname: str, projectname: str,
github_token_secret: str, github_token_secret: str,
github_bot_user: str, github_bot_user: str,
@ -281,10 +282,10 @@ def nix_update_flake_config(
) )
) )
return util.BuilderConfig( return util.BuilderConfig(
name="nix-update-flake", name=f"nix-update-flake-{repo}",
workernames=worker_names, workernames=worker_names,
factory=factory, factory=factory,
properties=dict(virtual_builder_name="nix-update-flake"), properties=dict(virtual_builder_name=f"nix-update-flake-{repo}"),
) )
def nix_eval_config( def nix_eval_config(

76
modules/buildbot/master.py
View file

@ -46,30 +46,41 @@ def build_config() -> dict[str, Any]:
c["schedulers"] = [ c["schedulers"] = [
# build all pushes to default branch # build all pushes to default branch
schedulers.SingleBranchScheduler( schedulers.SingleBranchScheduler(
name="main", name="main-nix-config",
change_filter=util.ChangeFilter( change_filter=util.ChangeFilter(
repository=f"https://github.com/{ORG}/{REPO}", repository=f"https://github.com/JulienMalka/nix-config",
filter_fn=lambda c: c.branch filter_fn=lambda c: c.branch
== c.properties.getProperty("github.repository.default_branch"), == c.properties.getProperty("github.repository.default_branch"),
), ),
builderNames=["nix-eval"], builderNames=["nix-eval"],
), ),
schedulers.SingleBranchScheduler(
name="main-linkal",
change_filter=util.ChangeFilter(
repository=f"https://github.com/JulienMalka/Linkal",
filter_fn=lambda c: c.branch
== c.properties.getProperty("github.repository.default_branch"),
),
builderNames=["nix-eval"],
),
# build all pull requests # build all pull requests
schedulers.SingleBranchScheduler( schedulers.SingleBranchScheduler(
name="prs", name="prs-nix-config",
change_filter=util.ChangeFilter( change_filter=util.ChangeFilter(
repository=f"https://github.com/{ORG}/{REPO}", category="pull" repository=f"https://github.com/{ORG}/{REPO}", category="pull"
), ),
builderNames=["nix-eval"], builderNames=["nix-eval"],
), ),
schedulers.SingleBranchScheduler( schedulers.SingleBranchScheduler(
name="flake-sources", name="prs-linkal",
change_filter=util.ChangeFilter( change_filter=util.ChangeFilter(
repository=f"https://github.com/{ORG}/nixpkgs", branch="main" repository=f"https://github.com/JulienMalka/Linkal", category="pull"
), ),
treeStableTimer=20, builderNames=["nix-eval"],
builderNames=["nix-update-flake"],
), ),
# this is triggered from `nix-eval` # this is triggered from `nix-eval`
schedulers.Triggerable( schedulers.Triggerable(
name="nix-build", name="nix-build",
@ -79,17 +90,31 @@ def build_config() -> dict[str, Any]:
schedulers.ForceScheduler(name="force", builderNames=["nix-eval"]), schedulers.ForceScheduler(name="force", builderNames=["nix-eval"]),
# allow to manually update flakes # allow to manually update flakes
schedulers.ForceScheduler( schedulers.ForceScheduler(
name="update-flake", name="update-flake-nix-config",
builderNames=["nix-update-flake"], builderNames=["nix-update-flake-linkal"],
buttonName="Update flakes", buttonName="Update flakes",
), ),
schedulers.ForceScheduler(
name="update-flake-linkal",
builderNames=["nix-update-flake-nix-config"],
buttonName="Update flakes",
),
# updates flakes once a weeek # updates flakes once a weeek
schedulers.Nightly( schedulers.Nightly(
name="update-flake-daily", name="update-flake-daily-nix-config",
builderNames=["nix-update-flake"], builderNames=["nix-update-flake-nix-config"],
hour=2, hour=2,
minute=0, minute=0,
), ),
schedulers.Nightly(
name="update-flake-daily-linkal",
builderNames=["nix-update-flake-linkal"],
dayOfWeek=6,
hour=2,
minute=0,
),
] ]
github_api_token = read_secret_file("github-token") github_api_token = read_secret_file("github-token")
@ -103,8 +128,6 @@ def build_config() -> dict[str, Any]:
), ),
] ]
# Shape of this file:
# [ { "name": "<worker-name>", "pass": "<worker-password>", "cores": "<cpu-cores>" } ]
worker_config = json.loads(read_secret_file("buildbot-nix-workers")) worker_config = json.loads(read_secret_file("buildbot-nix-workers"))
credentials = os.environ.get("CREDENTIALS_DIRECTORY", ".") credentials = os.environ.get("CREDENTIALS_DIRECTORY", ".")
@ -129,10 +152,19 @@ def build_config() -> dict[str, Any]:
nix_build_config(worker_names), nix_build_config(worker_names),
nix_update_flake_config( nix_update_flake_config(
worker_names, worker_names,
"nix-config",
f"{ORG}/{REPO}", f"{ORG}/{REPO}",
github_token_secret="github-token", github_token_secret="github-token",
github_bot_user=BUILDBOT_GITHUB_USER, github_bot_user=BUILDBOT_GITHUB_USER,
), ),
nix_update_flake_config(
worker_names,
"linkal",
f"JulienMalka/Linkal",
github_token_secret="github-token",
github_bot_user=BUILDBOT_GITHUB_USER,
),
] ]
github_admins = os.environ.get("GITHUB_ADMINS", "").split(",") github_admins = os.environ.get("GITHUB_ADMINS", "").split(",")
@ -150,7 +182,7 @@ def build_config() -> dict[str, Any]:
util.AnyControlEndpointMatcher(role="admins"), util.AnyControlEndpointMatcher(role="admins"),
], ],
), ),
"plugins": dict(console_view={}, badges ={ "plugins": dict(console_view={}, badges = {
"left_pad" : 5, "left_pad" : 5,
"left_text": "Build Status", # text on the left part of the image "left_text": "Build Status", # text on the left part of the image
"left_color": "#555", # color of the left part of the image "left_color": "#555", # color of the left part of the image
@ -161,14 +193,14 @@ def build_config() -> dict[str, Any]:
"font_face": "DejaVu Sans", "font_face": "DejaVu Sans",
"font_size": 11, "font_size": 11,
"color_scheme": { # color to be used for right part of the image "color_scheme": { # color to be used for right part of the image
"exception": "#007ec6", # blue "exception": "#007ec6",
"failure": "#e05d44", # red "failure": "#e05d44",
"retry": "#007ec6", # blue "retry": "#007ec6",
"running": "#007ec6", # blue "running": "#007ec6",
"skipped": "a4a61d", # yellowgreen "skipped": "a4a61d",
"success": "#4c1", # brightgreen "success": "#4c1",
"unknown": "#9f9f9f", # lightgrey "unknown": "#9f9f9f",
"warnings": "#dfb317" # yellow "warnings": "#dfb317"
} }
}), }),
"change_hook_dialects": dict( "change_hook_dialects": dict(