xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3266 from junxiawang/0615

Browse Source 
Refine test case: nodeset_cmdline, nodeset_runimage, nodeset_shell
This commit is contained in:
Weihua Hu 2017-06-21 13:56:10 +08:00 committed by GitHub
commit 998b5ee609
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-test/autotest/testcase/genesis/cases0
View File

@ -6,6 +6,7 @@ cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n
check:rc==0
cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -c
check:rc==0
cmd:cat /tmp/genesistestlog/*
end
start:nodeset_cmdline
@ -16,6 +17,7 @@ cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n
check:rc==0
cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -c
check:rc==0
cmd:cat /tmp/genesistestlog/*
end
start:nodeset_runimg
@ -26,4 +28,5 @@ cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n
check:rc==0
cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -c
check:rc==0
cmd:cat /tmp/genesistestlog/*
end

43
xCAT-test/autotest/testcase/genesis/genesistest.pl
View File

@ -1,11 +1,5 @@
#!/usr/bin/env perl
# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
BEGIN
{
$::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
}
use lib "$::XCATROOT/lib/perl";
use xCAT::Utils;
use strict;
use warnings;
use Getopt::Long;
@ -71,7 +65,7 @@ if (!defined($noderange)) {
print "$::USAGE";
exit 1;
}
my $os = xCAT::Utils->osver("all");
my $os = &get_os;
if ($check_genesis_file) {
send_msg(2, "[$$]:Check genesis file...............");
&check_genesis_file(&get_arch);
@ -81,8 +75,10 @@ if ($check_genesis_file) {
send_msg(2, "genesis file available");
}
}
my $master=xCAT::TableUtils->get_site_Master();
my $master=`lsdef -t site -i master -c 2>&1 | awk -F'=' '{print \$2}'`;
if (!$master) { $master=hostname(); }
chomp($master);
print "master is $master\n";
####################################
####nodesetshell test for genesis
@ -170,7 +166,7 @@ sub check_genesis_file {
sub rungenesiscmd {
my $runcmd_script = "/tmp/cmdtest";
my $result = "/tmp/testresult";
my $genesis_base_dir = "$::XCATROOT/share/xcat/netboot/genesis";
my $genesis_base_dir = "/opt/xcat/share/xcat/netboot/genesis";
my $genesis_bin_dir;
my $value = 0;
my $arch = shift;
@ -200,7 +196,7 @@ sub rungenesiscmd {
}
`rinstall $noderange "runcmd=cmdtest,shell"`;
if ($?) {
send_msg(0, "rinstall noderange shell failed for runcmd test");
send_msg(0, "rinstall noderange shell failed for runcmd test");
}
return $value;
}
@ -210,7 +206,7 @@ sub rungenesiscmd {
sub rungenesisimg {
my $runimg_script = "/tmp/imgtest";
my $result = "/tmp/testresult";
my $genesis_base_dir = "$::XCATROOT/share/xcat/netboot/genesis";
my $genesis_base_dir = "/opt/xcat/share/xcat/netboot/genesis";
my $genesis_bin_dir;
my $value = 0;
mkdir("/install/my_image");
@ -262,10 +258,12 @@ sub testxdsh {
$checkfile = "/proc/cmdline";
}
if (($value == 1) || ($value == 2) || ($value == 3)) {
`xdsh $noderange -t 2 cat $checkfile |grep $checkstring`;
`xdsh $noderange -t 2 cat $checkfile 2>&1|grep $checkstring `;
if ($?) {
foreach (1 .. 1500) {
`xdsh $noderange -t 2 cat $checkfile | grep $checkstring`;
foreach (1 .. 10) {
sleep 300;
send_msg(1,"try to run xdsh to check the results again");
`xdsh $noderange -t 2 cat $checkfile 2>&1| grep $checkstring `;
last if ($? == 0);
}
}
@ -283,7 +281,7 @@ sub clearenv {
my $runmetar = "/install/my_image/my_image.tgz";
my $runmetar_tmp = "/tmp/my_image.tgz";
my $runmedir = "/install/my_image";
my $genesis_base_dir = "$::XCATROOT/share/xcat/netboot/genesis";
my $genesis_base_dir = "/opt/xcat/share/xcat/netboot/genesis";
if (-e "$runimg_script") {
unlink("$runme");
unlink("$runmetar_tmp");
@ -311,6 +309,21 @@ sub clearenv {
return 0;
}
####################################
#get os
###################################
sub get_os {
my $os = "unknown";
my $output = `cat /etc/*release* 2>&1`;
if ($output =~ /suse/i) {
$os = "sles";
} elsif ($output =~ /Red Hat/i) {
$os = "redhat";
} elsif ($output =~ /ubuntu/i) {
$os = "ubuntu";
}
return $os;
}
####################################
#get arch
###################################
sub get_arch {