-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
podman-container: fix test #6150
Conversation
3194794
to
abf3ed8
Compare
podman-network: FAILED
Expected /nix/store/58fhlzb12kv3lyzbx2lkyl323swkd0dy-nmt-report-podman-network/normalized/podman-my-net-network.service to be same as /nix/store/nzdfwixn2d83dbfrf7znkd4dq26rqig0-network-expected.service but were different:
--- actual
+++ expected
@@ -23,14 +23,11 @@
ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
RemainAfterExit=yes
TimeoutStartSec=15
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet 192.168.1.0/24 --gateway 192.168.1.1 --opt isolate=true --label nix.home-manager.managed=true --ipam-driver dhcp --dns=192.168.55.1 --log-level=debug my-net
-SyslogIdentifier=%N
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet=192.168.1.0/24 --gateway=192.168.1.1 --opt isolate=true --label nix.home-manager.managed=true --ipam-driver dhcp --dns=192.168.55.1 --log-level=debug my-net
Type=oneshot
+SyslogIdentifier=%N
[Unit]
-Wants=podman-user-wait-network-online.service
-After=podman-user-wait-network-online.service
After=network.target
Description=Service for network my-net
-SourcePath=/nix/store/00000000000000000000000000000000-home-network-podman-my-net/quadlets/podman-my-net.network
RequiresMountsFor=%t/containers
For further reference please introspect /nix/store/58fhlzb12kv3lyzbx2lkyl323swkd0dy-nmt-report-podman-network |
I lumped the fixes into this PR (#6137) which also adds a few additional quadlets. Looking at it though, they probably should have been different PRs. Thanks for putting this in. At any rate, as @khaneliman stated, the podman-network test is still failing, but the rest look good. Fix that and I'll give this the 👍 for merge. @n-hass as he's the other podman maintainer. |
As I was digging into podman 5.3.0's changes, I realized that the new |
Co-authored-by: Dylan Wilson <dylan@bytepen.com>
Yeah ! The CI passes !!! Thanks @bamhm182 :) |
cc @rycee |
yep LGTM (although please make sure commits and PR reference the actual module name ‘podman’ :) ) |
Thanks for the fix! Merged to master now 🙂 |
Description
Fix the current CI failure by adapting the relevant snapshot.
Checklist
Change is backwards compatible.
Code formatted with
./format
.Code tested through
nix-shell --pure tests -A run.all
ornix develop --ignore-environment .#all
using Flakes.Test cases updated/added. See example.
Commit messages are formatted like
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
Maintainer CC