Public CLoud: Schedule Ansible client as SLE and target as SLEM

os-autoinst · Jul 27, 2023 · e53b88b · e53b88b
1 parent 641b6ee
commit e53b88b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/lib/main_micro_alp.pm b/lib/main_micro_alp.pm
@@ -13,6 +13,7 @@ use base 'Exporter';
 use Exporter;
 use main_common;
 use main_containers qw(load_container_tests is_container_test);
+use main_publiccloud 'load_ansible_tests';
 use testapi qw(check_var get_required_var get_var set_var);
 use version_utils;
 use utils;
@@ -278,9 +279,14 @@ sub load_slem_on_pc_tests {
 }
 
 sub load_tests {
-    # SLEM on PC
     if (is_public_cloud()) {
-        load_slem_on_pc_tests;
+        if (check_var('PUBLIC_CLOUD_ANSIBLE_TARGET', 1)) {
+            # SLE-Micro Ansible target
+            load_ansible_tests();
+        } else {
+            # SLEM on PC
+            load_slem_on_pc_tests();
+        }
         return 1;
     }
 
@@ -289,17 +295,6 @@ sub load_tests {
         return 1;
     }
 
-    if (check_var('PUBLIC_CLOUD_ANSIBLE_CLIENT', 1)) {
-        loadtest 'boot/boot_to_desktop';
-        loadtest 'publiccloud/ansible_client';
-        return 1;
-    }
-    elsif (check_var('PUBLIC_CLOUD_ANSIBLE_TARGET', 1)) {
-        loadtest 'microos/disk_boot';
-        loadtest 'publiccloud/ansible_target';
-        return 1;
-    }
-
     if (get_var('REMOTE_TARGET')) {
         load_remote_target_tests;
         return 1;

diff --git a/lib/main_publiccloud.pm b/lib/main_publiccloud.pm
@@ -19,6 +19,7 @@ require bmwqemu;
 
 our @EXPORT = qw(
   load_publiccloud_tests
+  load_ansible_tests
 );
 
 sub load_maintenance_publiccloud_tests {
@@ -180,6 +181,20 @@ sub load_publiccloud_download_repos {
     loadtest 'shutdown/shutdown';
 }
 
+sub load_ansible_tests {
+    if (check_var('PUBLIC_CLOUD_ANSIBLE_CLIENT', 1)) {
+        loadtest 'boot/boot_to_desktop';
+        loadtest 'publiccloud/ansible_client';
+        return 1;
+    }
+    elsif (check_var('PUBLIC_CLOUD_ANSIBLE_TARGET', 1)) {
+        loadtest 'microos/disk_boot';
+        loadtest 'publiccloud/ansible_target';
+        return 1;
+    }
+}
+
+
 =head2 load_publiccloud_tests
 
 C<load_publiccloud_tests> schedules the test jobs for the variety of groups.
@@ -194,6 +209,9 @@ sub load_publiccloud_tests {
     if (check_var('PUBLIC_CLOUD_PREPARE_TOOLS', 1)) {
         load_create_publiccloud_tools_image();
     }
+    if (check_var('PUBLIC_CLOUD_ANSIBLE_CLIENT', 1)) {
+        load_ansible_tests();
+    }
     elsif (check_var('PUBLIC_CLOUD_TOOLS_CLI', 1)) {
         load_publiccloud_cli_tools();
     }