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

[20.09] lxd: Backport #97550 #97593

Merged
merged 3 commits into from
Sep 10, 2020
Merged

[20.09] lxd: Backport #97550 #97593

merged 3 commits into from
Sep 10, 2020
+9 −6

Conversation

Patryk27
Copy link
Member

@Patryk27 Patryk27 commented Sep 9, 2020

This pull request backports #97550 for 20.09.

@worldofpeace
Copy link
Contributor

You need to use cherry-pick -x.

@roberth roberth changed the title lxd: Backport #97550 [20.09] lxd: Backport #97550 Sep 9, 2020
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 9, 2020
jonringer
jonringer reviewed Sep 10, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@Patryk27
lxd: use stable URL for Alpine's image

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
d5442b7 
(cherry picked from commit 04111cb)
@Patryk27
lxd: add wait_for_file() to ensure LXD is actually running

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
567bec0 
(cherry picked from commit 93b8435)
@Patryk27
lxd: s/sha256/hash

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
5585bd7 
(cherry picked from commit 183d9ab)
@Patryk27 Patryk27 force-pushed the fix-lxd-tests-backport-20.09 branch from befaa20 to 5585bd7 Compare September 10, 2020 05:48
@Patryk27
Copy link
Member Author

Reading be hard, sorry 🤦
I've adjusted pull request to the requirements :-)

@worldofpeace worldofpeace merged commit f4c73ef into NixOS:release-20.09 Sep 10, 2020
@worldofpeace
Copy link
Contributor

@Patryk27 Oh, sorry about that, it appears both me and Jon requested the same review 😬
All good now, thanks for backporting ✨

@Patryk27 Patryk27 deleted the fix-lxd-tests-backport-20.09 branch September 10, 2020 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Patryk27 @worldofpeace @jonringer