From 4764457cf291fd1feb6476726065ed5dd18ed7bf Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Thu, 14 Jul 2022 14:20:41 -0400 Subject: [PATCH] Debug command output35 --- github_action_xcat_test.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/github_action_xcat_test.pl b/github_action_xcat_test.pl index 01a27fa77..9cdb18282 100644 --- a/github_action_xcat_test.pl +++ b/github_action_xcat_test.pl @@ -354,7 +354,7 @@ sub install_xcat{ "echo \$PATH", ". /etc/profile.d/xcat.sh && tabdump policy", ". /etc/profile.d/xcat.sh && tabdump site", - "lsxcatd -a", + ". /etc/profile.d/xcat.sh && lsxcatd -a", "ls /opt/xcat/sbin", "service xcatd status"); my $ret = 0; @@ -389,9 +389,7 @@ sub install_xcat{ $check_result_str .= "> **INSTALL XCAT SUCCESSFUL**"; print $check_result_str; } - # MG - return 1; - # return 0; + return 0; } @@ -486,7 +484,7 @@ sub run_fast_regression_test{ @output = runcmd("cat $conf_file"); print Dumper \@output; - $cmd = "sudo /opt/xcat/bin/xcattest -s \"ci_test\" -l"; + $cmd = "sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -s \"ci_test\" -l'"; my @caseslist = runcmd("$cmd"); if($::RUNCMD_RC){ print RED "[run_fast_regression_test] $cmd ....[Failed]\n"; @@ -505,10 +503,10 @@ sub run_fast_regression_test{ my $failnum = 0; foreach my $case (@caseslist){ ++$x; - $cmd = "sudo /opt/xcat/bin/xcattest -f $conf_file -t $case"; + $cmd = "sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -f $conf_file -t $case'"; print "[run_fast_regression_test] run $x: $cmd\n"; @output = runcmd("$cmd"); - print Dumper \@output; + #print Dumper \@output; for(my $i = $#output; $i>-1; --$i){ if($output[$i] =~ /------END::(.+)::Failed/){ push @failcase, $1;