Port PublicCloud run_ltp to kirk

data/publiccloud/restart_instance.sh

@@ -16,9 +16,8 @@ wait_for_power_off()
         tries=$((tries - 1))
         [ "$tries" -lt 1 ] && return 1;
         echo "waiting for power off"
-        sleep 1;
+        sleep 1
     done
-    return 0;
 }
 
 wait_for_power_on()
@@ -32,7 +31,6 @@ wait_for_power_on()
         echo "waiting for power on"
         sleep 1;
     done
-    return 0;
 }
 
 if [ $# -lt 3 ]; then
@@ -71,6 +69,7 @@ esac
 wait_for_power_off "$HOST" "$CNT"
 wait_for_power_on "$HOST" "$CNT"
 echo "Instance $INSTANCE_ID restarted";
+sleep 5 # need pause for slow SUT to fully initialize sshd
 ## Not needed, because the log_instance.sh does not depend on the running instance
 ## Leaving it here in case we need to revert it. If no issues arise, this can be
 ## removed after some time.

tests/publiccloud/run_ltp.pm

@@ -1,6 +1,6 @@
 # SUSE's openQA tests
 #
-# Copyright 2018-2021 SUSE LLC
+# Copyright 2018-2024 SUSE LLC
 # SPDX-License-Identifier: FSFAP
 
 # Package: perl-base ltp
@@ -12,11 +12,11 @@ use Mojo::Base 'publiccloud::basetest';
 use testapi;
 use utils;
 use repo_tools 'generate_version';
+use Mojo::File;
+use Mojo::JSON;
 use Mojo::UserAgent;
 use LTP::utils qw(get_ltproot);
 use LTP::WhiteList;
-use Mojo::File;
-use Mojo::JSON;
 use publiccloud::utils qw(is_byos registercloudguest register_openstack);
 use publiccloud::ssh_interactive 'select_host_console';
 use Data::Dumper;
@@ -49,13 +49,11 @@ sub upload_ltp_logs
 {
     my $self = shift;
     my $ltp_testsuite = $self->{ltp_command};
-    my $log_file = Mojo::File::path('ulogs/result.json');
+    my $log_file = Mojo::File::path('ulogs/results.json');
 
     record_info('LTP Logs', 'upload');
-    upload_logs("$root_dir/result.json", log_name => $log_file->basename, failok => 1);
-    # debug file in the standart LTP log-dir. structure:
-    script_run("test -f /tmp/runltp.\$USER/latest/debug.log || echo No debug log");
-    upload_logs("/tmp/runltp.\$USER/latest/debug.log", failok => 1);
+    upload_logs("/tmp/kirk.\$USER/latest/results.json", log_name => $log_file->basename, failok => 1);
+    upload_logs("/tmp/kirk.\$USER/latest/debug.log", log_name => 'debug.txt', failok => 1);
 
     return unless -e $log_file->to_string;
 
@@ -131,20 +129,15 @@ sub run {
         my @skipped = $whitelist->list_skipped_tests($ltp_env, $ltp_command);
         if (@skipped) {
             $skip_tests = '^(' . join("|", @skipped) . ')$';
-            record_info(
-                "Exclude",
-                "Excluding tests: $skip_tests",
-            );
         }
     }
     $skip_tests .= '|' . $ltp_exclude if $ltp_exclude;
-    record_info("Full Exclude", "Excluding tests: $skip_tests");
+    record_info("Exclude", "Excluding tests: $skip_tests");
 
-    my $runltp_ng_repo = get_var("LTP_RUN_NG_REPO", "https://github.com/linux-test-project/runltp-ng.git");
-    my $runltp_ng_branch = get_var("LTP_RUN_NG_BRANCH", "master");
-    record_info('LTP CLONE REPO', "Repo: " . $runltp_ng_repo . "\nBranch: " . $runltp_ng_branch);
-
-    assert_script_run("git clone -q --single-branch -b $runltp_ng_branch --depth 1 $runltp_ng_repo");
+    my $kirk_repo = get_var("LTP_RUN_NG_REPO", "https://github.com/linux-test-project/kirk.git");
+    my $kirk_branch = get_var("LTP_RUN_NG_BRANCH", "master");
+    record_info('LTP RUNNER REPO', "Repo: " . $kirk_repo . "\nBranch: " . $kirk_branch);
+    assert_script_run("git clone -q --single-branch -b $kirk_branch --depth 1 $kirk_repo");
     $instance->run_ssh_command(cmd => 'sudo CREATE_ENTRIES=1 ' . get_ltproot() . '/IDcheck.sh', timeout => 300);
     record_info('Kernel info', $instance->run_ssh_command(cmd => q(rpm -qa 'kernel*' --qf '%{NAME}\n' | sort | uniq | xargs rpm -qi)));
     record_info('VM Detect', $instance->run_ssh_command(cmd => 'systemd-detect-virt'));
@@ -156,34 +149,34 @@ sub run {
 
     assert_script_run($log_start_cmd);
 
-    # LTP command line preparation
-    # The python3-paramiko is too old (2.4 on 15-SP6)
-    # The python311-paramiko is from SLE-Module-Python3-15-SP5-Updates which we have in PC tools image
-    zypper_call("in python311-paramiko python311-scp");
+    assert_script_run("cd kirk");
+    assert_script_run("python3.11 -m venv env311");
+    assert_script_run("source env311/bin/activate");
+    assert_script_run("pip3.11 install asyncssh msgpack");
 
     my $sut = ':user=' . $instance->username;
     $sut .= ':sudo=1';
     $sut .= ':key_file=$(realpath ' . $instance->provider->ssh_key . ')';
     $sut .= ':host=' . $instance->public_ip;
-    $sut .= ':reset_command=\'' . $reset_cmd . '\'';
+    $sut .= ':reset_cmd=\'' . $reset_cmd . '\'';
     $sut .= ':hostkey_policy=missing';
     $sut .= ':known_hosts=/dev/null';
 
-    my $cmd = 'python3.11 runltp-ng/runltp-ng ';
-    $cmd .= "--json-report=$root_dir/result.json ";
+    my $cmd = 'python3.11 kirk ';
+    $cmd .= "--framework ltp ";
     $cmd .= '--verbose ';
     $cmd .= '--exec-timeout=1200 ';
     $cmd .= '--suite-timeout=5400 ';
-    $cmd .= '--run-suite ' . get_required_var('LTP_COMMAND_FILE') . ' ';
+    $cmd .= '--run-suite ' . $ltp_command . ' ';
     $cmd .= '--skip-tests \'' . $skip_tests . '\' ' if $skip_tests;
     $cmd .= '--sut=ssh' . $sut . ' ';
     $cmd .= '--env ' . $env . ' ' if ($env);
+
     record_info('LTP START', 'Command launch');
-    assert_script_run($cmd, timeout => get_var('LTP_TIMEOUT', 30 * 60));
+    script_run($cmd, timeout => get_var('LTP_TIMEOUT', 30 * 60));
     record_info('LTP END', 'tests done');
 }
 
-
 sub cleanup {
     my ($self) = @_;
 
@@ -223,4 +216,4 @@ sub gen_ltp_env {
 =head1 Discussion
 
 Test module to run LTP test on publiccloud. The test run on a local qemu instance
-and connect to the CSP instance using SSH. This is done via the run_ltp_ssh.pl script.
+and connect to the CSP instance using SSH. This is done via the kirk.