buildkite-agent service: declarative hooks and extraConfig option #35129
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rvl
force-pushed
the
buildkite-agent-hooks
branch
from
50cfdfc
to
21c030b
Compare
domenkozar
reviewed
Feb 19, 2018
| @@ -101,7 +197,7 @@ in | |||
|
|
|||
| systemd.services.buildkite-agent = | |||
| let copy = x: target: perms: | |||
| "cp -f ${x} ${target}; ${pkgs.coreutils}/bin/chmod ${toString perms} ${target}; "; | |||
| "${pkgs.coreutils}/bin/cp -f ${x} ${target}; ${pkgs.coreutils}/bin/chmod ${toString perms} ${target}; "; | |||
There was a problem hiding this comment.
(nitpick) Maybe we could just add coreutils to path = cfg.runtimePackages ++ [ pkgs.coreutils] and we don't need to hardcode them here (for readability)?
There was a problem hiding this comment.
Good idea, thanks. I have fixed that.
domenkozar
approved these changes
Feb 19, 2018
This is useful for things like enabling debugging and increasing agent priority, which don't warrant extra module options.
Instead of having to set up a directory containing hook scripts, you can now directly set module options to add hooks.
I assumed they were space-separated, which was wrong. In future it might be better to allow specifying an attrset of strings for the option.
Newer versions of buildkite-agent can find the bootstrap script themselves.
Use the default name value from: https://buildkite.com/docs/agent/configuration
This simplifies the service script and it's probable that many builds will need coreutils anyway.
rvl
force-pushed
the
buildkite-agent-hooks
branch
from
21c030b
to
e552633
Compare
|
Thanks @zimbatm @domenkozar :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
I thought it would be better to be able to set hook scripts as module options rather than manually creating a directory with script files.
There are other possible settings in the buildkite-agent config file which aren't covered by module options, so I have added an
extraConfigoption to handle those.There are also other minor tweaks to the module.
The option changes are backwards compatible.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"/cc @deepfire @zimbatm @domenkozar