feat: add incoming ref data to non-flakes entrypoint

We can now implement a Nix library for Buildbot CI. :)

We dump it into a file, it's better to pass large stuff and easier to
escape things.

Signed-off-by: Raito Bezarius <raito@lix.systems>
This commit is contained in:
raito 2024-10-05 21:19:17 +02:00
parent b3a0b5a69e
commit e4552bdcf4

View file

@ -8,6 +8,7 @@ from collections.abc import Generator
from dataclasses import dataclass, field from dataclasses import dataclass, field
from pathlib import Path from pathlib import Path
from typing import TYPE_CHECKING, Any from typing import TYPE_CHECKING, Any
import tempfile
import buildbot import buildbot
from buildbot.configurators import ConfiguratorBase from buildbot.configurators import ConfiguratorBase
@ -374,6 +375,11 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
self.addLogObserver("stdio", self.observer) self.addLogObserver("stdio", self.observer)
self.supported_systems = supported_systems self.supported_systems = supported_systems
def __del__(self):
if os.path.exists('../incoming-ref-json'):
# Cleanup the incoming ref parameter file.
os.unlink('../incoming-ref-json')
@defer.inlineCallbacks @defer.inlineCallbacks
def run(self) -> Generator[Any, object, Any]: def run(self) -> Generator[Any, object, Any]:
# run nix-eval-jobs --flake .#$FLAKE_TARGET_ATTRIBUTE_FOR_JOBS to generate the dict of stages # run nix-eval-jobs --flake .#$FLAKE_TARGET_ATTRIBUTE_FOR_JOBS to generate the dict of stages
@ -453,13 +459,23 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
return result return result
def make_job_evaluator(name: str, settings: EvaluatorSettings, flake: bool) -> NixEvalCommand: def make_job_evaluator(name: str, settings: EvaluatorSettings, flake: bool, incoming_ref_data: dict[str, Any]) -> NixEvalCommand:
actual_command = [] actual_command = []
try:
eval_parameter_json_repr = json.dumps(incoming_ref_data)
except ValueError as e:
msg = f"Failed to serialize incoming ref data for {name}"
raise BuildbotNixError(msg) from e
with open('../incoming-ref-json', 'w') as f:
f.write(eval_parameter_json_repr)
if flake: if flake:
actual_command += ["--flake", f".#{FLAKE_TARGET_ATTRIBUTE_FOR_JOBS}"] actual_command += ["--flake", f".#{FLAKE_TARGET_ATTRIBUTE_FOR_JOBS}"]
else: else:
actual_command += ["--expr", "import ./.ci/buildbot.nix"] actual_command += ["--expr",
f"import ./.ci/buildbot.nix {{ incoming_ref_data = builtins.fromJSON (builtins.readFile ../incoming-ref-json); }}"]
return NixEvalCommand( return NixEvalCommand(
env={}, env={},
@ -504,6 +520,14 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
except Exception: except Exception:
configure_log: Log = yield self.addLog("stdio") configure_log: Log = yield self.addLog("stdio")
# This information can be passed at job evaluation time
# to skip some jobs, e.g. expensive jobs, etc.
incoming_ref_data = {
# TODO: please just denormalize it properly.
'event': {
key: value for (key, (value, _)) in self.getProperties().asDict().items() if key.startswith('event.')
}
}
# Takes precedence. # Takes precedence.
configure_log.addStdout("checking if there's a .ci/buildbot.nix...\n") configure_log.addStdout("checking if there's a .ci/buildbot.nix...\n")
ci_buildbot_defn_exists = yield self.pathExists('build/.ci/buildbot.nix') ci_buildbot_defn_exists = yield self.pathExists('build/.ci/buildbot.nix')
@ -514,7 +538,8 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
make_job_evaluator( make_job_evaluator(
"evaluate `.ci/buildbot.nix` jobs", "evaluate `.ci/buildbot.nix` jobs",
self.evaluator_settings, self.evaluator_settings,
False False,
incoming_ref_data
) )
] ]
) )
@ -527,7 +552,8 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
make_job_evaluator( make_job_evaluator(
"evaluate `flake.nix` jobs", "evaluate `flake.nix` jobs",
self.evaluator_settings, self.evaluator_settings,
True True,
incoming_ref_data
) )
] ]
) )