From fcebc34cdc5d7714d95b287862d4db16b71ad6fc Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 14 Mar 2023 14:21:36 -0400 Subject: [PATCH] Cirrus: Update CI VM images to F37 Thanks to @Luap99 for the test fix. Signed-off-by: Chris Evich --- common/.cirrus.yml | 4 ++-- common/libnetwork/netavark/run_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/.cirrus.yml b/common/.cirrus.yml index a2c58d3fa5..db3eba82bd 100644 --- a/common/.cirrus.yml +++ b/common/.cirrus.yml @@ -18,8 +18,8 @@ env: #### #### image names to test with (double-quotes around names are critical) #### - FEDORA_NAME: "fedora-36" - IMAGE_SUFFIX: "c5878804328480768" + FEDORA_NAME: "fedora-37" + IMAGE_SUFFIX: "c20230307t192532z-f37f36d12" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" diff --git a/common/libnetwork/netavark/run_test.go b/common/libnetwork/netavark/run_test.go index 5b950078cf..f75f70b9d4 100644 --- a/common/libnetwork/netavark/run_test.go +++ b/common/libnetwork/netavark/run_test.go @@ -302,7 +302,7 @@ var _ = Describe("run netavark", func() { err = libpodNet.Teardown(netNSContainer.Path(), types.TeardownOptions(setupOpts1)) Expect(err).ToNot(HaveOccurred()) - err = libpodNet.Teardown(netNSContainer.Path(), types.TeardownOptions(setupOpts2)) + err = libpodNet.Teardown(netNSContainer2.Path(), types.TeardownOptions(setupOpts2)) Expect(err).ToNot(HaveOccurred()) }) })