Compare commits
No commits in common. "non-flakes-rerun" and "main" have entirely different histories.
non-flakes
...
main
|
|
@ -24,7 +24,6 @@ from buildbot.reporters.generators.build import BuildStatusGenerator
|
|||
from buildbot.reporters.message import MessageFormatterFunction
|
||||
from buildbot.process.buildstep import EXCEPTION
|
||||
from buildbot.process.buildstep import SUCCESS
|
||||
from buildbot.process.buildstep import BuildStepFailed
|
||||
from buildbot.process.results import worst_status
|
||||
import requests
|
||||
|
||||
|
|
@ -40,14 +39,6 @@ log = Logger()
|
|||
|
||||
FLAKE_TARGET_ATTRIBUTE_FOR_JOBS = "buildbotJobs"
|
||||
|
||||
@dataclass
|
||||
class EvaluatorSettings:
|
||||
supported_systems: list[str]
|
||||
worker_count: int
|
||||
max_memory_size: int
|
||||
gc_roots_dir: str
|
||||
lock: util.MasterLock
|
||||
|
||||
@dataclass
|
||||
class NixBuilder:
|
||||
protocol: str
|
||||
|
|
@ -139,7 +130,7 @@ class GerritConfig:
|
|||
"""
|
||||
Returns the prefix to build a repourl using that gerrit configuration.
|
||||
"""
|
||||
return f'ssh://{self.username}@{self.domain}:{self.port}/'
|
||||
return 'ssh://{self.username}@{self.domain}:{self.port}/'
|
||||
|
||||
class BuildTrigger(steps.BuildStep):
|
||||
def __init__(
|
||||
|
|
@ -157,7 +148,7 @@ class BuildTrigger(steps.BuildStep):
|
|||
self.ended = False
|
||||
self.waitForFinishDeferred = None
|
||||
self.brids = []
|
||||
self.description = f"building {len(jobs)} jobs"
|
||||
self.description = f"building {len(jobs)} hydra jobs"
|
||||
super().__init__(**kwargs)
|
||||
|
||||
def interrupt(self, reason):
|
||||
|
|
@ -186,14 +177,15 @@ class BuildTrigger(steps.BuildStep):
|
|||
return sch
|
||||
|
||||
def schedule_one(self, build_props: Properties, job):
|
||||
project_name = build_props.getProperty("event.refUpdate.project") or build_props.getProperty("event.change.project")
|
||||
source = f"{project_name}-eval"
|
||||
project_name = build_props.getProperty('event.project')
|
||||
source = f"{project_name}-eval-lix"
|
||||
attr = job.get("attr", "eval-error")
|
||||
name = f"buildbotJobs.{attr}"
|
||||
name = attr
|
||||
name = f"{FLAKE_TARGET_ATTRIBUTE_FOR_JOBS}.{name}"
|
||||
error = job.get("error")
|
||||
props = Properties()
|
||||
props.setProperty("virtual_builder_name", name, source)
|
||||
props.setProperty("status_name", f"building buildbotJobs.{attr}", source)
|
||||
props.setProperty("status_name", f"nix-build .#{FLAKE_TARGET_ATTRIBUTE_FOR_JOBS}.{attr}", source)
|
||||
props.setProperty("virtual_builder_tags", "", source)
|
||||
|
||||
if error is not None:
|
||||
|
|
@ -380,8 +372,7 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
|||
# run nix-eval-jobs --flake .#$FLAKE_TARGET_ATTRIBUTE_FOR_JOBS to generate the dict of stages
|
||||
cmd: remotecommand.RemoteCommand = yield self.makeRemoteShellCommand()
|
||||
build_props = self.build.getProperties()
|
||||
project_name = build_props.getProperty("event.refUpdate.project") or build_props.getProperty("event.change.project")
|
||||
assert project_name is not None, "`event.refUpdate.project` or `event.change.project` is not available on the build properties, unexpected build type!"
|
||||
project_name = build_props.get('event.project')
|
||||
|
||||
yield self.runCommand(cmd)
|
||||
|
||||
|
|
@ -405,27 +396,14 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
|||
if not system or system in self.supported_systems: # report eval errors
|
||||
filtered_jobs.append(job)
|
||||
|
||||
# Filter out failed evaluations
|
||||
succeeded_jobs = [job for job in filtered_jobs if job.get('error') is None]
|
||||
|
||||
drv_show_log: Log = yield self.getLog("stdio")
|
||||
all_deps = dict()
|
||||
|
||||
def closure_of(key, deps):
|
||||
r, size = set([key]), 0
|
||||
while len(r) != size:
|
||||
size = len(r)
|
||||
r.update(*[ deps[k] for k in r ])
|
||||
return r.difference([key])
|
||||
|
||||
if succeeded_jobs:
|
||||
drv_show_log.addStdout(f"getting derivation infos for valid derivations\n")
|
||||
drv_show_log.addStdout(f"getting derivation infos\n")
|
||||
cmd = yield self.makeRemoteShellCommand(
|
||||
stdioLogName=None,
|
||||
collectStdout=True,
|
||||
command=(
|
||||
["nix", "derivation", "show", "--recursive"]
|
||||
+ [ drv for drv in (job.get("drvPath") for job in succeeded_jobs) if drv ]
|
||||
+ [ drv for drv in (job.get("drvPath") for job in filtered_jobs) if drv ]
|
||||
),
|
||||
)
|
||||
yield self.runCommand(cmd)
|
||||
|
|
@ -435,9 +413,17 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
|||
except json.JSONDecodeError as e:
|
||||
msg = f"Failed to parse `nix derivation show` output for {cmd.command}"
|
||||
raise BuildbotNixError(msg) from e
|
||||
all_deps = dict()
|
||||
for drv, info in drv_info.items():
|
||||
all_deps[drv] = set(info.get("inputDrvs").keys())
|
||||
|
||||
def closure_of(key, deps):
|
||||
r, size = set([key]), 0
|
||||
while len(r) != size:
|
||||
size = len(r)
|
||||
r.update(*[ deps[k] for k in r ])
|
||||
return r.difference([key])
|
||||
|
||||
job_set = set(( drv for drv in ( job.get("drvPath") for job in filtered_jobs ) if drv ))
|
||||
all_deps = { k: list(closure_of(k, all_deps).intersection(job_set)) for k in job_set }
|
||||
|
||||
|
|
@ -445,7 +431,7 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
|||
[
|
||||
BuildTrigger(
|
||||
builds_scheduler_group=f"{project_name}-nix-build",
|
||||
name="build derivations",
|
||||
name="build flake",
|
||||
jobs=filtered_jobs,
|
||||
all_deps=all_deps,
|
||||
),
|
||||
|
|
@ -454,88 +440,6 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
|||
|
||||
return result
|
||||
|
||||
def make_job_evaluator(name: str, settings: EvaluatorSettings, flake: bool) -> NixEvalCommand:
|
||||
actual_command = []
|
||||
|
||||
if flake:
|
||||
actual_command += ["--flake", f".#{FLAKE_TARGET_ATTRIBUTE_FOR_JOBS}"]
|
||||
else:
|
||||
actual_command += ["--expr", "import ./.ci/buildbot.nix"]
|
||||
|
||||
return NixEvalCommand(
|
||||
env={},
|
||||
name=name,
|
||||
supported_systems=settings.supported_systems,
|
||||
command=[
|
||||
"nix-eval-jobs",
|
||||
"--workers",
|
||||
str(settings.worker_count),
|
||||
"--max-memory-size",
|
||||
str(settings.max_memory_size),
|
||||
"--gc-roots-dir",
|
||||
settings.gc_roots_dir,
|
||||
"--force-recurse",
|
||||
"--check-cache-status",
|
||||
] + actual_command,
|
||||
haltOnFailure=True,
|
||||
locks=[settings.lock.access("exclusive")]
|
||||
)
|
||||
|
||||
class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
|
||||
name = "determining jobs"
|
||||
"""
|
||||
Determine what `NixEvalCommand` step should be added after
|
||||
based on the existence of:
|
||||
|
||||
- flake.nix
|
||||
- .ci/buildbot.nix
|
||||
"""
|
||||
|
||||
def __init__(self, eval_settings: EvaluatorSettings, **kwargs: Any) -> None:
|
||||
self.evaluator_settings = eval_settings
|
||||
super().__init__(**kwargs)
|
||||
self.observer = logobserver.BufferLogObserver()
|
||||
self.addLogObserver("stdio", self.observer)
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def run(self) -> Generator[Any, object, Any]:
|
||||
try:
|
||||
configure_log: Log = yield self.getLog("stdio")
|
||||
except Exception:
|
||||
configure_log: Log = yield self.addLog("stdio")
|
||||
|
||||
# Takes precedence.
|
||||
configure_log.addStdout("checking if there's a .ci/buildbot.nix...\n")
|
||||
ci_buildbot_defn_exists = yield self.pathExists('build/.ci/buildbot.nix')
|
||||
if ci_buildbot_defn_exists:
|
||||
configure_log.addStdout(".ci/buildbot.nix found, configured for non-flake CI\n")
|
||||
self.build.addStepsAfterCurrentStep(
|
||||
[
|
||||
make_job_evaluator(
|
||||
"evaluate `.ci/buildbot.nix` jobs",
|
||||
self.evaluator_settings,
|
||||
False
|
||||
)
|
||||
]
|
||||
)
|
||||
return SUCCESS
|
||||
|
||||
flake_exists = yield self.pathExists('build/flake.nix')
|
||||
if flake_exists:
|
||||
configure_log.addStdout(f"flake.nix found")
|
||||
self.build.addStepsAfterCurrentStep([
|
||||
make_job_evaluator(
|
||||
"evaluate `flake.nix` jobs",
|
||||
self.evaluator_settings,
|
||||
True
|
||||
)
|
||||
]
|
||||
)
|
||||
return SUCCESS
|
||||
|
||||
configure_log.addStdout("neither flake.nix found neither .ci/buildbot.nix, no CI to run!")
|
||||
return SUCCESS
|
||||
|
||||
class NixBuildCommand(buildstep.ShellMixin, steps.BuildStep):
|
||||
"""Builds a nix derivation."""
|
||||
|
|
@ -577,19 +481,10 @@ def nix_eval_config(
|
|||
worker_count: int,
|
||||
max_memory_size: int,
|
||||
) -> util.BuilderConfig:
|
||||
"""
|
||||
Uses nix-eval-jobs to evaluate the entrypoint of this project.
|
||||
"""Uses nix-eval-jobs to evaluate $FLAKE_TARGET_ATTRIBUTE_FOR_JOBS (`.#hydraJobs` by default) from flake.nix in parallel.
|
||||
For each evaluated attribute a new build pipeline is started.
|
||||
"""
|
||||
factory = util.BuildFactory()
|
||||
|
||||
gerrit_private_key = None
|
||||
with open(project.private_sshkey_path, 'r') as f:
|
||||
gerrit_private_key = f.read()
|
||||
|
||||
if gerrit_private_key is None:
|
||||
raise RuntimeError('No gerrit private key to fetch the repositories')
|
||||
|
||||
# check out the source
|
||||
factory.addStep(
|
||||
steps.Gerrit(
|
||||
|
|
@ -597,10 +492,9 @@ def nix_eval_config(
|
|||
mode="full",
|
||||
retry=[60, 60],
|
||||
timeout=3600,
|
||||
sshPrivateKey=gerrit_private_key
|
||||
sshPrivateKey=project.private_sshkey_path
|
||||
),
|
||||
)
|
||||
|
||||
# use one gcroots directory per worker. this should be scoped to the largest unique resource
|
||||
# in charge of builds (ie, buildnumber is too narrow) to not litter the system with permanent
|
||||
# gcroots in case of worker restarts.
|
||||
|
|
@ -609,22 +503,27 @@ def nix_eval_config(
|
|||
"/nix/var/nix/gcroots/per-user/buildbot-worker/%(prop:project)s/drvs/%(prop:workername)s/",
|
||||
)
|
||||
|
||||
eval_settings = EvaluatorSettings(
|
||||
supported_systems=supported_systems,
|
||||
worker_count=worker_count,
|
||||
max_memory_size=max_memory_size,
|
||||
gc_roots_dir=drv_gcroots_dir,
|
||||
lock=eval_lock
|
||||
)
|
||||
|
||||
# NixConfigure will choose
|
||||
# how to add a NixEvalCommand job
|
||||
# based on whether there's a flake.nix or
|
||||
# a .ci/buildbot.nix.
|
||||
factory.addStep(
|
||||
NixConfigure(
|
||||
eval_settings
|
||||
)
|
||||
NixEvalCommand(
|
||||
env={},
|
||||
name="evaluate flake",
|
||||
supported_systems=supported_systems,
|
||||
command=[
|
||||
"nix-eval-jobs",
|
||||
"--workers",
|
||||
str(worker_count),
|
||||
"--max-memory-size",
|
||||
str(max_memory_size),
|
||||
"--gc-roots-dir",
|
||||
drv_gcroots_dir,
|
||||
"--force-recurse",
|
||||
"--check-cache-status",
|
||||
"--flake",
|
||||
f".#{FLAKE_TARGET_ATTRIBUTE_FOR_JOBS}"
|
||||
],
|
||||
haltOnFailure=True,
|
||||
locks=[eval_lock.access("exclusive")],
|
||||
),
|
||||
)
|
||||
|
||||
factory.addStep(
|
||||
|
|
@ -813,6 +712,12 @@ def config_for_project(
|
|||
),
|
||||
],
|
||||
)
|
||||
gerrit_private_key = None
|
||||
with open(project.private_sshkey_path, 'r') as f:
|
||||
gerrit_private_key = f.read()
|
||||
|
||||
if gerrit_private_key is None:
|
||||
raise RuntimeError('No gerrit private key to fetch the repositories')
|
||||
|
||||
config["builders"].extend(
|
||||
[
|
||||
|
|
@ -919,15 +824,13 @@ class GerritNixConfigurator(ConfiguratorBase):
|
|||
prometheus_config: dict[str, int | str] | None = None,
|
||||
binary_cache_config: dict[str, str] | None = None,
|
||||
auth_method: AuthBase | None = None,
|
||||
manhole: Any = None,
|
||||
) -> None:
|
||||
super().__init__()
|
||||
self.manhole = manhole
|
||||
self.allowed_origins = allowed_origins
|
||||
self.gerrit_server = gerrit_server
|
||||
self.gerrit_user = gerrit_user
|
||||
self.gerrit_port = gerrit_port
|
||||
self.gerrit_sshkey_path = str(gerrit_sshkey_path)
|
||||
self.gerrit_sshkey_path = gerrit_sshkey_path
|
||||
self.gerrit_config = GerritConfig(domain=self.gerrit_server,
|
||||
username=self.gerrit_user,
|
||||
port=self.gerrit_port)
|
||||
|
|
@ -957,9 +860,6 @@ class GerritNixConfigurator(ConfiguratorBase):
|
|||
worker_config = json.loads(read_secret_file(self.nix_workers_secret_name))
|
||||
worker_names = []
|
||||
|
||||
if self.manhole is not None:
|
||||
config["manhole"] = self.manhole
|
||||
|
||||
config.setdefault("projects", [])
|
||||
config.setdefault("secretsProviders", [])
|
||||
config.setdefault("www", {
|
||||
|
|
|
|||
|
|
@ -7,9 +7,6 @@
|
|||
let
|
||||
inherit (lib) filterAttrs;
|
||||
cfg = config.services.buildbot-nix.coordinator;
|
||||
debuggingManhole = if cfg.debugging.enable then
|
||||
"manhole.TelnetManhole(${toString cfg.debugging.port}, 'admin', 'admin')"
|
||||
else "None";
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
|
@ -31,14 +28,6 @@ in
|
|||
description = "List of local remote builders machines associated to that Buildbot instance";
|
||||
};
|
||||
|
||||
debugging = {
|
||||
enable = lib.mkEnableOption "manhole's buildbot debugging on localhost using `admin:admin`";
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 15000;
|
||||
};
|
||||
};
|
||||
|
||||
oauth2 = {
|
||||
name = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
|
|
@ -174,14 +163,6 @@ in
|
|||
'';
|
||||
example = [ "lix" ];
|
||||
};
|
||||
|
||||
projects = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of projects which are to check on Gerrit.
|
||||
'';
|
||||
example = [ "lix" ];
|
||||
};
|
||||
};
|
||||
|
||||
binaryCache = {
|
||||
|
|
@ -235,7 +216,6 @@ in
|
|||
extraImports = ''
|
||||
from datetime import timedelta
|
||||
from buildbot_nix import GerritNixConfigurator, read_secret_file, make_oauth2_method, OAuth2Config, assemble_secret_file_path
|
||||
from buildbot import manhole
|
||||
|
||||
# TODO(raito): make me configurable from the NixOS module.
|
||||
# how?
|
||||
|
|
@ -277,8 +257,7 @@ in
|
|||
auth_method=CustomOAuth2(${builtins.toJSON cfg.oauth2.clientId},
|
||||
read_secret_file('buildbot-oauth2-secret'),
|
||||
autologin=True
|
||||
),
|
||||
manhole=${debuggingManhole}
|
||||
)
|
||||
)
|
||||
''
|
||||
];
|
||||
|
|
|
|||
Loading…
Reference in a new issue