Skip to content

Commit

Permalink
Merge pull request #20625 from BillAnastasiadis/12sp5preval2
Browse files Browse the repository at this point in the history
Softfail prevalidation for 12sp5
  • Loading branch information
BillAnastasiadis authored Nov 14, 2024
2 parents 580078e + e315663 commit 1b3b1da
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/sles4sap_publiccloud.pm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use publiccloud::ssh_interactive 'select_host_console';
use publiccloud::instance;
use sles4sap;
use saputils;
use version_utils 'is_sle';

our @EXPORT = qw(
run_cmd
Expand Down Expand Up @@ -1275,6 +1276,11 @@ sub wait_for_cluster {
if ($args{max_retries} <= 0) {
record_info('NOT OK', "Cluster or DB data synchronization issue detected after retrying.");
$self->display_full_status();
# softfail because of bsc#1233026 - if fixed remove the 'if' condition AND the 'use version_utils' from this file
if (is_sle('=12-SP5') && $crm_output =~ /TimeoutError/) {
record_soft_failure("bsc#1233026 - Error occurred, see previous output: Proceeding despite failure.");
return;
}
die "Cluster is not ready after specified retries.";
}
sleep($args{wait_time});
Expand Down

0 comments on commit 1b3b1da

Please sign in to comment.