nixos home-assistant: a couple of fixes #36338
Merged
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
Mic92
reviewed
Mar 5, 2018
| configFile | ||
| ]; | ||
| path = [ | ||
| "/run/wrappers" |
dotlambda
reviewed
Mar 5, 2018
| @@ -121,6 +120,19 @@ in { | |||
| ReadWritePaths = "${cfg.configDir}"; | |||
| PrivateTmp = true; | |||
| }; | |||
| restartTriggers = [ | |||
| configFile | |||
There was a problem hiding this comment.
Actually, thinking about it, shouldn't this be unnecessary becasue configFile is mentioned in preStart?
There was a problem hiding this comment.
Yes. It should be unnecessary, since preStart is regenerated if cfg.config changes.
|
Can you rebase on staging so we can run the test? |
|
I've run the test locally against unstable (with the pytest-mock upgrade reverted), which was fine, but of course we can try against staging. |
a) set path to /run/wrappers so ping works b) restart if the configuration file changes c) run via a target so we can easily inject other components (config copier, appdaemon)
|
Ehhh...... What the what? Rebasing against staging didn't exactly go as planned... |
|
@peterhoeg I have rebased. We can wait with merging until the pytest-mock fix is in master. @GrahamcOfBorg test home-assistant |
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Partial log (click to expand)
|
|
I don't know why ofborg failed. I tested locally and it works fine. |
|
@GrahamcOfBorg test home-assistant |
|
@GrahamcOfBorg test home-assistant |
|
Success on aarch64-linux (full log) Attempted: tests.home-assistant Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: tests.home-assistant Partial log (click to expand)
|
|
@peterhoeg Feel free to backport to 18.03. |
|
Failure on aarch64-linux (full log) Attempted: tests.home-assistant Partial log (click to expand)
|
peterhoeg
added a commit
that referenced
this pull request
Mar 18, 2018
a) set path to /run/wrappers so ping works b) run via a target so we can easily inject other components (config copier, appdaemon) (cherry picked from commit 2859483)
|
Failure on x86_64-linux (full log) Attempted: tests.home-assistant Partial log (click to expand)
|
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
a) set path to /run/wrappers so ping works (what gets added is /run/wrappers/{bin,sbin})
b) restart if the configuration file changes
c) run via a target so we can easily inject other components (config copier, appdaemon)
Cc: @dotlambda
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)