From c67d6a52c42c97b6b8f127eb66f21871058e36fa Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 4 Apr 2022 11:39:56 -0400
Subject: [PATCH] Fix using --network-backend on podman-remote

When this option was added to the e2e tests, there was no CI Automation
support for running remote tests w/ netavark.  When added, many
e2e test errors/failures are generated due to this option not being
valid for the remote client.  Fix this in the tests by conditionally
adding the option if the test is running the remote client.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 test/e2e/common_test.go              | 11 ++++-------
 test/e2e/libpod_suite_remote_test.go |  3 +++
 test/utils/utils.go                  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 9580230b53..2f4146bba8 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -858,18 +858,15 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache boo
 		eventsType = "none"
 	}
 
-	networkBackend := p.NetworkBackend.ToString()
-	networkDir := p.NetworkConfigDir
-	if p.NetworkBackend == Netavark {
-		networkDir = p.NetworkConfigDir
-	}
 	podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s",
-		debug, p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, networkDir, p.CgroupManager, p.TmpDir, eventsType), " ")
+		debug, p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.NetworkConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ")
 	if os.Getenv("HOOK_OPTION") != "" {
 		podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
 	}
 
-	podmanOptions = append(podmanOptions, "--network-backend", networkBackend)
+	if !p.RemoteTest {
+		podmanOptions = append(podmanOptions, "--network-backend", p.NetworkBackend.ToString())
+	}
 
 	podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
 	if !noCache {
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go
index dddcf5c14f..9ad2bf7b9c 100644
--- a/test/e2e/libpod_suite_remote_test.go
+++ b/test/e2e/libpod_suite_remote_test.go
@@ -137,6 +137,9 @@ func getRemoteOptions(p *PodmanTestIntegration, args []string) []string {
 	if os.Getenv("HOOK_OPTION") != "" {
 		podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
 	}
+	if p.NetworkBackend.ToString() == "netavark" {
+		podmanOptions = append(podmanOptions, "--network-backend", "netavark")
+	}
 	podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
 	podmanOptions = append(podmanOptions, args...)
 	return podmanOptions
diff --git a/test/utils/utils.go b/test/utils/utils.go
index da56a3a2e6..39a0ac875d 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -110,7 +110,7 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string
 	}
 
 	runCmd := append(wrapper, podmanBinary)
-	if p.NetworkBackend == Netavark {
+	if !p.RemoteTest && p.NetworkBackend == Netavark {
 		runCmd = append(runCmd, []string{"--network-backend", "netavark"}...)
 	}