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

Buildkite agent fixup #77773

Merged
merged 2 commits into from Jan 15, 2020
Merged

Buildkite agent fixup #77773

merged 2 commits into from Jan 15, 2020

Conversation

mrkkrp
Copy link
Member

@mrkkrp mrkkrp commented Jan 15, 2020

Motivation for this change

There are two changes:

  • Update the buildkite agent version.
  • Fix a bug in NixOS' buildkite agent service module so that the services.buildkite-agent.package actually has effect. In addition to that, version 3 allows us to set tags="gueue=test" which is rejected if meta-data is set before tags the whole configuration is rejected. So I figured that we should only set meta-data when it's actually specified by the user.
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.

grahamc
grahamc approved these changes Jan 15, 2020
View reviewed changes
Copy link
Member

@grahamc grahamc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another improvement which would be nice to make is letting openssh.privateKeyPath and openssh.publicKeyPath be optional.

@mrkkrp
Copy link
Member Author

mrkkrp commented Jan 15, 2020

I have to go now, but if you can wait a little bit I'll make those optional. And maybe add more options that we actually use instead of putting them in extra config.

@grahamc
Copy link
Member

grahamc commented Jan 15, 2020

How about we do that as a different PR?

A third thing which would be really nice is making metadata an attribute set:

metadata = {
    queue = "test";
    another-thing = "whatever";
};

I never remember how to set metadata, and get it wrong. If it was an attribute set like this, it would be immediately obvious.

@mrkkrp
Copy link
Member Author

mrkkrp commented Jan 15, 2020

I’m OK with doing it in a different PR. In that case you can merge this one, unless there is something else to be done?

@grahamc grahamc merged commit 40e18bc into NixOS:master Jan 15, 2020
@grahamc
Copy link
Member

grahamc commented Jan 15, 2020

I forgot to test that building buildkite worked, and so I tested it locally and it did :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc grahamc approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mrkkrp @grahamc