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

Merge pull request #947 from junxiawang/dockerxcatreg

Browse Source 
modify xCATreg for setup docker hosts
This commit is contained in:
tingtli 2016-04-28 17:33:22 +08:00
commit 99e4f718aa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/share/xcat/tools/xCATreg
View File

@ -711,6 +711,7 @@ sub do_test {
my $diskless_installation_hierarchy_testcase="";
my $statelite_installation_hierarchy_by_ramdisk_testcase="";
my $statelite_installation_hierarchy_by_nfs_testcase="";
my $setup_dockerhost_testcase="";
my $batbundle="";
if((($mn =~ /sles/) || ($mn =~ /rh/)) && ($mn !~ /E/)){
$diskfull_installation_flat_testcase="reg_linux_diskfull_installation_flat";
@ -728,6 +729,7 @@ sub do_test {
}elsif($mn =~ /ubuntux/){
$diskfull_installation_flat_testcase="Ubuntu_full_installation_flat_x86_vm";
$diskless_installation_flat_testcase="Ubuntu_diskless_installation_flat_x86_vm";
$setup_dockerhost_testcase="Full_installation_flat_docker";
$batbundle="x_ubuntu_cmd.bundle";
}elsif($mn =~ /E/){
$diskfull_installation_flat_testcase="Full_installation_flat_p8_le";
@ -869,6 +871,12 @@ sub do_test {
send_msg(2, "[$mn->$confkeys{$mn}][do_test] do diskfull installation test in flat mode in $mn.....[done]");
last if($rc != 0);
#set up dockerhosts
send_msg(2, "[$mn->$confkeys{$mn}][do_test] setupdockerhost $mn.....");
$rc=system("ssh -t $confkeys{$mn} 'exec bash -l -i -c \"xcattest -f /opt/xcat/share/xcat/tools/autotest/default.conf -t $setup_dockerhost_testcase\"' >/dev/null 2>&1");
send_msg(2, "[$mn->$confkeys{$mn}][do_test] setup dockerhosts $mn.....[done]");
last if($rc != 0);
#commands bundle in flat mode test
send_msg(2, "[$mn->$confkeys{$mn}][do_test] doing all commands test in flat mode in $mn.....");
$rc=system("ssh -t $confkeys{$mn} 'exec bash -l -i -c \"xcattest -f /opt/xcat/share/xcat/tools/autotest/default.conf -b $batbundle\"' >/dev/null 2>&1");
@ -950,7 +958,7 @@ sub creat_report{
}elsif($k =~ /ubuntux/){
$batbundle="/$xcatcoredir/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle";
$totalcase=`cat $batbundle|wc -l`;
$totalcase+=2;
$totalcase+=3;
}elsif($k =~ /E/){
$batbundle="$xcatcoredir/xCAT-test/autotest/bundle/le_rhels_cmd.bundle" if($k =~ /rhLE/);
$batbundle="$xcatcoredir/xCAT-test/autotest/bundle/le_sles_cmd.bundle" if($k =~ /slesLE/);