Merge pull request os-autoinst#23804 from lilyeyes/softfail-supportconfig-timeout

Fix sporadic supportconfig times out

Author: lilyeyes

lib/sles4sap/qesap/qesapdeployment.pm

@@ -1354,14 +1354,14 @@ sub qesap_upload_supportconfig_logs {
         filter => "\"$args{host}\"",
         host_keys_check => 1,
         verbose => 1,
-        timeout => bmwqemu::scale_timeout(7200),
+        timeout => bmwqemu::scale_timeout(600),
         failok => $args{failok});
     qesap_ansible_cmd(cmd => "sudo chmod 755 /var/tmp/scc_$log_filename.txz",
         provider => $args{provider},
         filter => "\"$args{host}\"",
         host_keys_check => 1,
         verbose => 1,
-        timeout => bmwqemu::scale_timeout(7200),
+        timeout => bmwqemu::scale_timeout(60),
         failok => $args{failok});
     my $local_path = qesap_ansible_fetch_file(provider => $args{provider},
         host => $args{host},

lib/sles4sap/sap_deployment_automation_framework/deployment.pm

@@ -1219,7 +1219,7 @@ sub sdaf_upload_logs {
     }
 
     # Uploading supportconfig log (it is time consuming so it is conditional)
-    if (get_var('SUPPORTCONGFIG')) {
+    if (get_var('SUPPORTCONFIG')) {
         record_info('Uploading supportconfig log');
         script_run("sudo supportconfig -B $hostname", timeout => 1800);
         # Sometimes the tar ball is scc_${hostname}_xxx-xxx-xxx-*.txz

lib/sles4sap_publiccloud.pm

@@ -226,7 +226,9 @@ sub sles4sap_cleanup {
     type_string('', terminate_with => 'ETX');
 
     qesap_cluster_logs();
-    qesap_supportconfig_logs(provider => get_required_var('PUBLIC_CLOUD_PROVIDER'));
+    if ((defined $self->{result}) && ($self->{result} eq 'fail')) {
+        qesap_supportconfig_logs(provider => get_required_var('PUBLIC_CLOUD_PROVIDER'));
+    }
     qesap_upload_logs();
     upload_logs('/var/tmp/ssh_sut.log', failok => 1, log_name => 'ssh_sut.log.txt');
 

t/20_sdaf_deployment_library.t

@@ -565,10 +565,10 @@ subtest '[sdaf_upload_logs]' => sub {
     Test::MockModule->new('basetest');
     $autotest::current_test = new basetest;
 
-    set_var('SUPPORTCONGFIG', undef);
+    set_var('SUPPORTCONFIG', undef);
     ok sdaf_upload_logs(hostname => $arguments{hostname}, sap_sid => $arguments{sap_sid});
 
-    set_var('SUPPORTCONGFIG', '1');
+    set_var('SUPPORTCONFIG', '1');
     ok sdaf_upload_logs(hostname => $arguments{hostname}, sap_sid => $arguments{sap_sid});
 };
 

tests/sles4sap/publiccloud/hana_sr_schedule_cleanup.pm

@@ -45,7 +45,7 @@ sub run {
     # Direct schedule of qesap_cleanup is not possible
     # due to the fact that hana_sr_schedule_cleanup is scheduled
     # with other test modules that are also using loadtest
-    loadtest('sles4sap/publiccloud/qesap_cleanup', name => "Cleanup resources", run_args => $run_args, @_);
+    loadtest('sles4sap/publiccloud/qesap_cleanup', name => "Cleanup_resources", run_args => $run_args, @_);
 }
 
 1;