feat: add incoming ref data to non-flakes entrypoint

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

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

View file

@ -454,13 +454,21 @@ 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
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"] print("eval parameter", eval_parameter_json_repr, file=sys.stderr)
actual_command += ["--expr",
f"import ./.ci/buildbot.nix {{ incoming_ref_data = \"{eval_parameter_json_repr}\"; }}"]
return NixEvalCommand( return NixEvalCommand(
env={}, env={},
@ -505,6 +513,11 @@ 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 = {
'event': self.getProperty('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')
@ -515,7 +528,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
) )
] ]
) )
@ -528,7 +542,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
) )
] ]
) )