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.

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

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 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.
mrkkrp added 2 commits Jan 15, 2020
Copy link
Member

grahamc left a comment

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

@mrkkrp

This comment has been minimized.

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

This comment has been minimized.

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

This comment has been minimized.

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
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@grahamc

This comment has been minimized.

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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.