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

Jump to bottom

nixos/buildbot-master: fix typo in services.buildbot-master.bpPort #89510

Merged
merged 1 commit into from Jun 5, 2020
Merged

nixos/buildbot-master: fix typo in services.buildbot-master.bpPort #89510

merged 1 commit into from Jun 5, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jun 4, 2020

it's pbPort, and it's also a connection string, meaning
listen-on-localhost is also possible. Provide an alias for the old
option name, so old configs still work.

Motivation for this change

Having to write typos on purpose in the config is annoying, also only listening on localhost if the worker is on the same machine is nice.

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.

@lopsided98
Copy link
Contributor

@ofborg test buildbot

lopsided98
lopsided98 suggested changes Jun 4, 2020
View reviewed changes
nixos/modules/services/continuous-integration/buildbot/master.nix Outdated Show resolved Hide resolved
nixos/tests/buildbot.nix Outdated Show resolved Hide resolved
@flokli
nixos/buildbot-master: fix typo in services.buildbot-master.bpPort
1fd972b 
It's pbPort, and it's also a connection string, meaning
listen-on-localhost is also possible. Provide an alias for the old
option name, so old configs still work.
@flokli
Copy link
Contributor Author

flokli commented Jun 4, 2020

@ofborg test buildbot

makefu
makefu approved these changes Jun 4, 2020
View reviewed changes
Copy link
Contributor

@makefu makefu left a comment

Choose a reason for hiding this comment

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

commit looks good on paper, i am sure you have tested both options (str and int).

@flokli
Copy link
Contributor Author

flokli commented Jun 5, 2020

Yeah, I edited the buildbot vm test to ensure setting both pbPort to int or str work and the test still succeeds.

@flokli flokli merged commit c055fc0 into NixOS:master Jun 5, 2020
@flokli flokli deleted the buildbot-pbPort branch June 5, 2020 09:50
@makefu
Copy link
Contributor

makefu commented Jun 5, 2020

@flokli thanks!

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

@makefu makefu makefu approved these changes

@lopsided98 lopsided98 lopsided98 approved these changes

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@Lassulus Lassulus Awaiting requested review from Lassulus

@jonringer jonringer Awaiting requested review from jonringer

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @lopsided98 @makefu