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 #2312 from junxiawang/1214

Browse Source 
modify makedhcp -q issue
This commit is contained in:
yangsong 2016-12-15 15:21:54 +08:00 committed by GitHub
commit c7eb8b8025
8 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le
View File

@ -16,9 +16,8 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
check:output=~$$CN
cmd:makedns -n
check:rc==0
cmd:makeconservercf $$CN

3
xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy
View File

@ -20,9 +20,8 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$SN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$SN);[ $? -ne 0 ] && exit 1;echo $output|grep $$SN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
check:output=~$$SN
cmd:chdef -t node $$SN groups=service,all
check:rc==0
cmd:chdef -t group -o service profile=service primarynic=mac installnic=mac

3
xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat
View File

@ -28,9 +28,8 @@ check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:sleep 10
cmd:makedhcp -q $$CN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
check:output=~$$CN
cmd:copycds $$ISO
check:rc==0
cmd:chdef -t node -o $$CN postscripts=setupntp

3
xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
View File

@ -23,8 +23,7 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
check:output=~$$CN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
cmd:copycds $$ISO
check:rc==0

3
xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat
View File

@ -17,9 +17,8 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
check:output=~$$CN
cmd:copycds $$ISO
check:rc==0

3
xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy
View File

@ -21,9 +21,8 @@ cmd:makedhcp -a
check:rc==0
cmd:service dhcpd restart
check:rc==0
cmd:makedhcp -q $$CN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
check:output=~$$CN
cmd:copycds $$ISO
check:rc==0

3
xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm
View File

@ -15,9 +15,8 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
check:output=~$$CN
cmd:makeconservercf $$CN
check:rc==0
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi

3
xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm
View File

@ -10,9 +10,8 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
check:output=~$$CN
cmd:makeconservercf $$CN
check:rc==0
cmd:cat /etc/conserver.cf | grep $$CN