Merge pull request #16824 from dzedro/smt

Simplify smt test
os-autoinst · Apr 11, 2023 · b92e99c · b92e99c
2 parents 092ee62 + 9d08303
commit b92e99c
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 45 deletions.
diff --git a/products/sle/main.pm b/products/sle/main.pm
@@ -1110,26 +1110,6 @@ else {
             loadtest 'support_server/windows/win2019_boot';
         }
     }
-    elsif (get_var('QAM_SMT')) {
-        set_var('INSTALLONLY', 1);
-        if (check_var('HOSTNAME', 'server')) {
-            barrier_create('smt_setup', 2);
-            barrier_create('smt_registered', 2);
-            boot_hdd_image;
-            loadtest 'network/setup_multimachine';
-            loadtest 'smt/smt_server';
-        }
-        elsif (check_var('HOSTNAME', 'client1')) {
-            boot_hdd_image;
-            loadtest 'network/setup_multimachine';
-            loadtest 'smt/smt_client1';
-        }
-        else {
-            #default hostname, installation and setting up smt server
-            boot_hdd_image;
-            loadtest 'smt/smt_server_install';
-        }
-    }
     elsif (get_var('QAM_MAIL_THUNDERBIRD')) {
         set_var('INSTALLONLY', 1);
         boot_hdd_image;

diff --git a/schedule/qam/12-SP5/qam-smt-client.yaml b/schedule/qam/12-SP5/qam-smt-client.yaml
@@ -0,0 +1,12 @@
+---
+name: qam-smt-client
+description:    >
+    Maintainer: qe-core@suse.com
+vars:
+  BOOT_HDD_IMAGE: 1
+  HOSTNAME: 'client'
+schedule:
+- boot/boot_to_desktop
+- network/setup_multimachine
+- smt/smt_client
+...
diff --git a/schedule/qam/12-SP5/qam-smt-server.yaml b/schedule/qam/12-SP5/qam-smt-server.yaml
@@ -0,0 +1,13 @@
+---
+name: qam-smt-server
+description:    >
+    Maintainer: qe-core@suse.com
+vars:
+  BOOT_HDD_IMAGE: 1
+  HOSTNAME: 'server'
+schedule:
+- boot/boot_to_desktop
+- network/setup_multimachine
+- smt/smt_server_install
+- smt/smt_server
+...
diff --git a/tests/smt/smt_client1.pm → tests/smt/smt_client.pm b/tests/smt/smt_client1.pm → tests/smt/smt_client.pm
@@ -10,17 +10,18 @@
 # - Get registration script and certificate from server
 # - Register
 # - Check registration
-# Maintainer: Katerina Lorenzova <klorenzova@suse.cz>
+# Maintainer: QE Core <qe-core@suse.com>
 
 use base 'consoletest';
 use strict;
 use warnings;
 use testapi;
 use utils;
 use lockapi;
+use serial_terminal qw(select_serial_terminal);
 
 sub run {
-    select_console 'root-console';
+    select_serial_terminal;
 
     zypper_call 'in smt-client';
     assert_script_run 'SUSEConnect --cleanup';
@@ -40,5 +41,8 @@ sub run {
     validate_script_output 'zypper lr --uri', sub { m/SLES12-SP5-Updates *\| Yes/ };
     validate_script_output 'zypper lr --uri', sub { m/SLES12-SP5-Pool *\| Yes/ };
     barrier_wait 'smt_registered';
+    # install some packages
+    zypper_call('in apache2 mariadb qemu', timeout => 300);
+    barrier_wait 'smt_finished';
 }
 1;
diff --git a/tests/smt/smt_server.pm b/tests/smt/smt_server.pm
@@ -8,29 +8,32 @@
 # - Run basic smt commands
 # - Wait for client registraton
 # - Check client registration
-# Maintainer: Katerina Lorenzova <klorenzova@suse.cz>
+# Maintainer: QE Core <qe-core@suse.com>
 
 use base 'consoletest';
 use strict;
 use warnings;
 use testapi;
 use utils;
 use lockapi;
+use serial_terminal qw(select_serial_terminal);
 
 sub run {
-    select_console 'root-console';
+    mutex_create 'barrier_setup_done';
+
+    select_serial_terminal;
 
     assert_script_run 'smt-repos -m';
     validate_script_output 'SUSEConnect --status', sub { m/"identifier":"SLES","version":"12\.5","arch":"x86_64","status":"Registered"/ };
     validate_script_output 'smt-repos -o', sub { m/SLES12-SP5-Updates/ };
 
-    mutex_create 'barrier_setup_done';
     barrier_wait 'smt_setup';
 
     #time for registration of clients
 
     barrier_wait 'smt_registered';
-    validate_script_output 'smt-list-registrations', sub { m/client1/ };
+    validate_script_output 'smt-list-registrations', sub { m/client/ };
     assert_script_run 'smt-job -l';
+    barrier_wait 'smt_finished';
 }
 1;
diff --git a/tests/smt/smt_server_install.pm b/tests/smt/smt_server_install.pm
@@ -9,43 +9,39 @@
 # - Configure smt server
 # - Use yast certificate to issue correct cert
 # - Mirror repositories
-# Maintainer: Katerina Lorenzova <klorenzova@suse.cz>
+# Maintainer: QE Core <qe-core@suse.com>
 
-use base 'x11test';
+use base 'y2_module_consoletest';
 use strict;
 use warnings;
 use testapi;
 use utils;
 use lockapi;
 use mm_network;
+use serial_terminal qw(select_serial_terminal);
 
 sub run {
     my ($self) = @_;
-    select_console 'root-console';
+    select_serial_terminal;
+    barrier_create('smt_setup', 2);
+    barrier_create('smt_registered', 2);
+    barrier_create('smt_finished', 2);
 
     zypper_call 'in -t pattern smt';
     zypper_call 'in mariadb';
 
-    assert_script_run 'hostnamectl set-hostname server';
+    select_console 'root-console';
 
     my $module_name = y2_module_consoletest::yast2_console_exec(yast2_module => 'smt-wizard');
 
-    wait_still_screen;
+    assert_screen "smt_settings";
     wait_screen_change { send_key "alt-f" };
     wait_screen_change { send_key "alt-u" };
     type_string get_var('SMT_USER');
-    wait_screen_change { send_key "alt-p" };
+    send_key "alt-p";
+    wait_still_screen(1);
     type_string get_var('SMT_PASSWORD');
-
-    wait_screen_change { send_key "alt-s" };
-    type_string 'osukup@suse.com';
-    wait_screen_change { send_key "alt-y" };
-    foreach (0 .. 15) {
-        send_key "backspace";
-    }
-    type_string "http://server/";
-    assert_screen "smt_settings";
-
+    wait_still_screen(1);
     wait_screen_change { send_key "alt-t" };
     assert_screen "smt-test-succ", 120;
     wait_screen_change { send_key "ret" };
@@ -147,24 +143,26 @@ sub run {
     wait_screen_change { send_key "alt-f" };
     wait_serial("$module_name-0", 200) || die "yast2 ca_mgm failed";
 
+
     #mirroring repos
+    select_serial_terminal;
+    systemctl('restart apache');
     assert_script_run "df -h";    #mirroring needs quite a lot of space
     save_screenshot;
 
     validate_script_output "SUSEConnect --status", sub { m/"identifier":"SLES","version":"12\.5","arch":"x86_64","status":"Registered"/ };
     assert_script_run "smt-repos -o";
-    validate_script_output "smt-repos -m", sub { m/SLES12-SP5-Updates/ }, timeout => 200;
+    validate_script_output "smt-repos -m SLES12-SP5-Updates", sub { m/SLES12-SP5-Updates/ }, timeout => 200;
 
     assert_script_run "smt-repos -e SLES12-SP5-Updates sle-12-x86_64";
     assert_script_run "smt-repos -e SLES12-SP5-Pool sle-12-x86_64";
     validate_script_output "smt-repos -o", sub { m/SLES12-SP5-Updates/ };
     validate_script_output "smt-repos -o", sub { m/SLES12-SP5-Pool/ };
 
-    assert_script_run "smt-mirror", 16000;
+    assert_script_run "smt-mirror", 4000;
 
     assert_script_run "df -h";
     save_screenshot;
-    select_console "x11";
 }
 
 sub test_flags {