diff --git a/xCAT-test/autotest/testcase/makehosts/cases0 b/xCAT-test/autotest/testcase/makehosts/cases0 index 98b505981..c647af508 100644 --- a/xCAT-test/autotest/testcase/makehosts/cases0 +++ b/xCAT-test/autotest/testcase/makehosts/cases0 @@ -15,7 +15,7 @@ check:output=~Usage end start:makehosts_null -description:makehosts +description:makehosts label:mn_only,dns cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest cmd:chtab node=nouse_compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|" @@ -23,12 +23,12 @@ check:rc==0 cmd:mkdef -t node -o node01,node02 groups="nouse_compute" check:rc==0 cmd:sleep 30 -cmd:XCATBYPASS=1 makehosts +cmd:XCATBYPASS=1 makehosts check:rc==0 cmd:sleep 30 cmd:cat /etc/hosts -check:output=~1.2.3.2 -check:output=~1.2.3.1 +check:output=~1.2.3.2 +check:output=~1.2.3.1 check:output=~node01 check:output=~node02 cmd:chtab -d node=nouse_compute hosts @@ -46,7 +46,7 @@ check:rc==0 cmd:chdef -t node -o node01,node02 groups="nouse_compute" check:rc==0 cmd:sleep 30 -cmd:lsdef -l nouse_compute +cmd:lsdef -l nouse_compute cmd:XCATBYPASS=1 makehosts -l check:rc==0 cmd:sleep 30 @@ -70,7 +70,7 @@ check:rc==0 cmd:lsdef -l node01 cmd:sleep 30 cmd:cat /etc/hosts -cmd:makehosts node01 +cmd:makehosts node01 check:rc==0 cmd:sleep 30 cmd:cat /etc/hosts |tee /tmp/1 @@ -133,7 +133,7 @@ cmd:chtab -d node=compute hosts cmd:rmdef node01 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts cmd:cat /etc/hosts| grep -v node01 > /tmp/1 -cmd:mv -f /tmp/1 /etc/hosts +cmd:mv -f /tmp/1 /etc/hosts cmd:rm -rf /tmp/hosts end @@ -154,13 +154,13 @@ check:rc==0 cmd:cat /etc/hosts cmd:#!/bin/bash file="/etc/hosts" -for i in {1..5}; do +for i in {1..5}; do if (grep "70.2.0.254 s01" $file >/dev/null 2>&1) && (grep "80.2.0.254 s01r1b01" $file >/dev/null 2>&1); then exit 0; else echo "Do not find s01 and s01r1b01 in $file, sleep $[i*2] seconds and try again" sleep $[i*2] - fi + fi done exit 1 check:rc==0 @@ -215,7 +215,7 @@ cmd:cp -f /etc/hosts.xcatbakautotest /etc/hosts cmd:makehosts check:rc==0 cmd:cat /etc/hosts -cmd:makehosts -d service +cmd:makehosts -d service check:rc==0 cmd:cat /etc/hosts cmd:#!/bin/bash