Merge pull request #20443 from ricardobranco777/purge_vark

containers: Remove netavark & aardvark-dns upstream tests
os-autoinst · Oct 21, 2024 · 5b0d9e8 · 5b0d9e8
2 parents 601b378 + 711615c
commit 5b0d9e8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 172 deletions.
diff --git a/lib/main_containers.pm b/lib/main_containers.pm
@@ -298,19 +298,13 @@ sub load_container_tests {
         return;
     }
 
-    if (get_var('SKOPEO_BATS_SKIP') || get_var('RUNC_BATS_SKIP') || get_var('NETAVARK_BATS_SKIP') || get_var('AARDVARK_BATS_SKIP')) {
+    if (get_var('SKOPEO_BATS_SKIP') || get_var('RUNC_BATS_SKIP')) {
         if (!check_var('SKOPEO_BATS_SKIP', 'all')) {
             loadtest 'containers/skopeo_integration' if (is_tumbleweed || is_microos || is_sle || is_leap || is_sle_micro('>=5.5'));
         }
         if (!check_var('RUNC_BATS_SKIP', 'all')) {
             loadtest 'containers/runc_integration' if (is_tumbleweed || is_sle || is_leap);
         }
-        if (!check_var('NETAVARK_BATS_SKIP', 'all')) {
-            loadtest 'containers/netavark_integration' if (is_tumbleweed || is_sle || is_leap);
-        }
-        if (!check_var('AARDVARK_BATS_SKIP', 'all')) {
-            loadtest 'containers/aardvark_integration' if (is_tumbleweed);
-        }
         return;
     }
 

diff --git a/tests/containers/aardvark_integration.pm b/tests/containers/aardvark_integration.pm
diff --git a/tests/containers/netavark_integration.pm b/tests/containers/netavark_integration.pm