From cc7a1e614840ac4ef9f2aa9a36da1fd2c7b23f85 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Wed, 8 Mar 2023 13:42:34 +0100 Subject: [PATCH 1/2] CI: Switch to c20230307t192532z-f37f36d12 images They include Fedora package passt-0^20230227.gc538ee8-1.fc37 and passt-0.0~git20230227.c538ee8-1 for Debian, so that we can re-enable the "Local Forwarder, IPv4" test for pasta(1). Signed-off-by: Stefano Brivio --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f4fde0fa0c..8b4d933764 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,7 +32,7 @@ env: DEBIAN_NAME: "debian-12" # Image identifiers - IMAGE_SUFFIX: "c20230223t153813z-f37f36d12" + IMAGE_SUFFIX: "c20230307t192532z-f37f36d12" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}" From f928cf54aa17790d2a96d980d1c9f0753f0e5326 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Wed, 8 Mar 2023 13:45:22 +0100 Subject: [PATCH 2/2] pasta: Re-enable "Local forwarder, IPv4" test, accept NXDOMAIN as response This case is fixed by passt commit bad252687271 ("conf, udp: Allow any loopback address to be used as resolver") and the fix is now available in packages included by the CI images. Note that, depending on the resolver on the host, we might get 1.0.0.127.in-addr.arpa resolved to localhost, or simply NXDOMAIN for it: accept a failure on the nslookup command, as long as we have a response for 1.0.0.127.in-addr.arpa in the output. If we have any response, that means we could talk to the resolver. Signed-off-by: Stefano Brivio --- test/system/505-networking-pasta.bats | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/system/505-networking-pasta.bats b/test/system/505-networking-pasta.bats index d22e6d66e5..032c9b0b89 100644 --- a/test/system/505-networking-pasta.bats +++ b/test/system/505-networking-pasta.bats @@ -319,7 +319,7 @@ function teardown() { @test "podman networking with pasta(1) - External resolver, IPv4" { skip_if_no_ipv4 "IPv4 not routable on the host" - run_podman run --net=pasta $IMAGE nslookup 127.0.0.1 || : + run_podman '?' run --net=pasta $IMAGE nslookup 127.0.0.1 assert "$output" =~ "1.0.0.127.in-addr.arpa" \ "127.0.0.1 not resolved" @@ -335,14 +335,12 @@ function teardown() { } @test "podman networking with pasta(1) - Local forwarder, IPv4" { - skip "FIXME: #17074: some pasta dns problem" skip_if_no_ipv4 "IPv4 not routable on the host" run_podman run --dns 198.51.100.1 \ - --net=pasta:--dns-forward,198.51.100.1 $IMAGE nslookup 127.0.0.1 + --net=pasta:--dns-forward,198.51.100.1 $IMAGE nslookup 127.0.0.1 || : - assert "$output" =~ "1.0.0.127.in-addr.arpa" \ - "127.0.0.1 not resolved to 1.0.0.127.in-addr.arpa" + assert "$output" =~ "1.0.0.127.in-addr.arpa" "No answer from resolver" } @test "podman networking with pasta(1) - Local forwarder, IPv6" {