Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-organize the buildkite agent module #77831

Closed
wants to merge 1 commit into from
Closed

Re-organize the buildkite agent module #77831

wants to merge 1 commit into from

Conversation

mrkkrp
Copy link
Member

@mrkkrp mrkkrp commented Jan 16, 2020

Motivation for this change

Improve usability of the buildkite agent module, especially with the version 3.x of the agent.

There are four changes:

  • Made openssh.privateKeyPath and openssh.publicKeyPath optional.
  • Made the meta-deta confinguration option accept a string dictionary
    instead of a plain string.
  • In the version 3.x of buildkite agent meta-data is called tags. To
    keep support for both 2.x and 3.x versions of the agent, I just added the
    configuration option called tags which mirrors meta-data.
  • In the previous commit it should have been cfg.package instead of
    cfg.buildkite-agent. This commit fixes that.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mrkkrp
Re-organize the buildkite agent module
b70ea63 
There are four changes:

* Made `openssh.privateKeyPath` and `openssh.publicKeyPath` optional.
* Made the `meta-deta` confinguration option accept a string dictionary
  instead of a plain string.
* In the version 3.x of buildkite agent `meta-data` is called `tags`. To
  keep support for both 2.x and 3.x versions of the agent, I just added the
  configuration option called `tags` which mirrors `meta-data`.
* In the previous commit it should have been `cfg.package` instead of
  `cfg.buildkite-agent`. This commit fixes that.
@flokli
Copy link
Contributor

flokli commented Jan 17, 2020

I already had some work going on in #68378, which cleans up even more stuff (and drops buildkite v2 - as the latest release there was in Jan 2018).

I'm currently rebasing that on top of master.

@flokli flokli mentioned this pull request Jan 17, 2020
Merged
10 tasks
@flokli
Copy link
Contributor

flokli commented Jan 17, 2020

Are you fine to close this in favor of #77950?

@mrkkrp
Copy link
Member Author

mrkkrp commented Jan 17, 2020

Yes, let's close.

@mrkkrp mrkkrp closed this Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mrkkrp @flokli