From 27a35ff46c12d4b40480634cc68faa88e2538b05 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 14 Dec 2016 08:19:09 -0500 Subject: [PATCH 1/2] modify makedhcp -q issue --- .../autotest/testcase/installation/Full_installation_flat_p8_le | 2 +- .../testcase/installation/reg_linux_SN_installation_hierarchy | 2 +- .../testcase/installation/reg_linux_diskfull_installation_flat | 2 +- .../installation/reg_linux_diskfull_installation_hierarchy | 2 +- .../testcase/installation/reg_linux_diskless_installation_flat | 2 +- .../installation/reg_linux_diskless_installation_hierarchy | 2 +- .../testcase/installation/ubuntu_diskless_installation_vm | 2 +- .../autotest/testcase/installation/ubuntu_full_installation_vm | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le b/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le index a058f5560..66aeb4c49 100644 --- a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le +++ b/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le @@ -16,7 +16,7 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:makedhcp -q $$CN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:rc==0 check:output=~$$CN cmd:makedns -n diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy index 0ff095d64..20a536aa7 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy @@ -20,7 +20,7 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:makedhcp -q $$SN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:rc==0 check:output=~$$SN cmd:chdef -t node $$SN groups=service,all diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat index b9c7d65bf..4ec302dfd 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -28,7 +28,7 @@ check:rc==0 cmd:makedhcp -a check:rc==0 cmd:sleep 10 -cmd:makedhcp -q $$CN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:rc==0 check:output=~$$CN cmd:copycds $$ISO diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy index 355887076..b33db473e 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy @@ -23,7 +23,7 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:makedhcp -q $$CN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:output=~$$CN check:rc==0 cmd:copycds $$ISO diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat index 32cd3a986..7ac0f0711 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat @@ -17,7 +17,7 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:makedhcp -q $$CN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:rc==0 check:output=~$$CN diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy index 43de73914..b0977c417 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy @@ -21,7 +21,7 @@ cmd:makedhcp -a check:rc==0 cmd:service dhcpd restart check:rc==0 -cmd:makedhcp -q $$CN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:rc==0 check:output=~$$CN diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm b/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm index 568c3125f..d29e8cfae 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm +++ b/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm @@ -15,7 +15,7 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:makedhcp -q $$CN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:rc==0 check:output=~$$CN cmd:makeconservercf $$CN diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm index 274ad028f..3a6c2559b 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm +++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm @@ -10,7 +10,7 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:makedhcp -q $$CN +cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done check:rc==0 check:output=~$$CN cmd:makeconservercf $$CN From 3c0f8e9e0cc373b47accc179a836ef28c8528267 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Thu, 15 Dec 2016 06:31:17 -0500 Subject: [PATCH 2/2] modify makedhcp -q issue --- .../testcase/installation/Full_installation_flat_p8_le | 3 +-- .../testcase/installation/reg_linux_SN_installation_hierarchy | 3 +-- .../testcase/installation/reg_linux_diskfull_installation_flat | 3 +-- .../installation/reg_linux_diskfull_installation_hierarchy | 3 +-- .../testcase/installation/reg_linux_diskless_installation_flat | 3 +-- .../installation/reg_linux_diskless_installation_hierarchy | 3 +-- .../testcase/installation/ubuntu_diskless_installation_vm | 3 +-- .../autotest/testcase/installation/ubuntu_full_installation_vm | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le b/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le index 66aeb4c49..0b7779db2 100644 --- a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le +++ b/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le @@ -16,9 +16,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done +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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy index 20a536aa7..f9d36a595 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy @@ -20,9 +20,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done +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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat index 4ec302dfd..c99eb4aa0 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -28,9 +28,8 @@ check:rc==0 cmd:makedhcp -a check:rc==0 cmd:sleep 10 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done +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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy index b33db473e..5e3ce50c8 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy @@ -23,8 +23,7 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done -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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat index 7ac0f0711..9b3c04e60 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat @@ -17,9 +17,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done +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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy index b0977c417..219d8cda9 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy @@ -21,9 +21,8 @@ cmd:makedhcp -a check:rc==0 cmd:service dhcpd restart check:rc==0 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done +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 diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm b/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm index d29e8cfae..492a26820 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm +++ b/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm @@ -15,9 +15,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done +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 diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm index 3a6c2559b..951693ce7 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm +++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm @@ -10,9 +10,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:a=0;while true;do output=`makedhcp -q $$CN|grep $$CN`;if [ $? -gt 0 ]; then let a++;sleep 1; else exit 0;fi; if [ $a -gt 100 ]; then exit 1;fi done +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