Merge pull request os-autoinst#18487 from danishprakash/podman-4.8-ne…

…twork-fix podman_netavark: conditionally rm containers.conf (contd.)
sofiasyria · Jan 19, 2024 · d37545b · d37545b
2 parents d412fae + 620c6cb
commit d37545b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tests/containers/podman_netavark.pm b/tests/containers/podman_netavark.pm
@@ -88,14 +88,17 @@ sub run {
 
     select_serial_terminal;
     my $podman = $self->containers_factory('podman');
-    my $podman_version = get_podman_version();
 
+    my $podman_version = get_podman_version();
     if (package_version_cmp($podman_version, '4.0.0') < 0) {
         record_info('No support', "Netavark backend is not supported in podman-$podman_version");
         return 1;
     }
 
-    switch_to_netavark if is_cni_default || is_cni_in_tw;
+    if ((is_cni_default || is_cni_in_tw) && package_version_cmp($podman_version, '4.8.0') < 0) {
+        switch_to_netavark;
+    }
+
     $podman->cleanup_system_host();
 
     # it is turned off in