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

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

Hide file tree

Showing 3 changed files with 35 additions and 19 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_CLIENT', 1) || 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.

diff --git a/tests/publiccloud/ansible_client.pm b/tests/publiccloud/ansible_client.pm
@@ -8,24 +8,30 @@
 
 use base "consoletest";
 use serial_terminal 'select_serial_terminal';
+use transactional qw(trup_call process_reboot);
 use strict;
 use warnings;
 use testapi;
-use mmapi;
-use utils qw(zypper_call);
-use network_utils qw(setup_static_network);
 use lockapi;
+use mm_network qw(setup_static_mm_network);
+use utils qw(zypper_call);
 
 sub run {
     my ($self, $args) = @_;
     select_serial_terminal;
 
     record_info('system', script_output('cat /etc/os-release'));
-    setup_static_network(ip => '10.0.2.15/15', gw => '10.0.2.2');
+    # setup_static_network(ip => '10.0.2.15/15', gw => '10.0.2.2');
+    # record_info('ip', script_output('ip a'));
+    # record_info('route', script_output('ip r'));
+    # assert_script_run('echo "10.0.2.20  microos" >> /etc/hosts');
+    # zypper_call('in -y iputils git');
+
+    setup_static_mm_network('10.0.2.15/15');
+
     record_info('ip', script_output('ip a'));
     record_info('route', script_output('ip r'));
-    assert_script_run('echo "10.0.2.20  microos" >> /etc/hosts');
-    zypper_call('in -y iputils git');
+    script_run('ping -c 1 download.suse.de');
 
     assert_script_run('mkdir /root/.ssh');
     assert_script_run('curl -f -v ' . autoinst_url . '/data/slenkins/ssh/id_rsa > /root/.ssh/id_rsa');