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

podman-container: fix test #6150

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Conversation

GaetanLepage
Copy link
Member

@GaetanLepage GaetanLepage commented Nov 28, 2024

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 or nix develop --ignore-environment .#all using Flakes.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

Maintainer CC

@GaetanLepage GaetanLepage force-pushed the podman branch 2 times, most recently from 3194794 to abf3ed8 Compare November 28, 2024 15:58
@khaneliman
Copy link
Contributor

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

@bamhm182
Copy link
Contributor

bamhm182 commented Dec 1, 2024

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.

@bamhm182
Copy link
Contributor

bamhm182 commented Dec 1, 2024

As I was digging into podman 5.3.0's changes, I realized that the new podman-user-wait-network-online.service dependency added to these configs is broken on NixOS because it can't resolve sh or systemctl. I have made a PR on @GaetanLepage 's fork here to resolve the remaining issues Podman 5.3.0 has brought into this module.

Co-authored-by: Dylan Wilson <dylan@bytepen.com>
@GaetanLepage
Copy link
Member Author

Yeah ! The CI passes !!! Thanks @bamhm182 :)

@GaetanLepage
Copy link
Member Author

cc @rycee

@n-hass
Copy link
Contributor

n-hass commented Dec 1, 2024

yep LGTM (although please make sure commits and PR reference the actual module name ‘podman’ :) )

@rycee rycee merged commit 873e39d into nix-community:master Dec 2, 2024
3 checks passed
@rycee
Copy link
Member

rycee commented Dec 2, 2024

Thanks for the fix! Merged to master now 🙂

@GaetanLepage GaetanLepage deleted the podman branch December 2, 2024 10:05
@n-hass n-hass mentioned this pull request Dec 3, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants