xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 19:32:31 +00:00
Code Issues Releases Wiki Activity

move useless lines

Browse Source
This commit is contained in:
huweihua
2019-04-02 21:53:17 -04:00
parent 8cce4d9078
commit d5ecc62fdb
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,13 +11,9 @@ check:rc==0
cmd:makedns -n
check:rc==0
cmd:service goconserver status
cmd:service conserver status
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:sleep 20
cmd:service goconserver status
cmd:service conserver status
cmd:if [[ "__GETNODEATTR($$CN,arch)__" = "ppc64" ]] && [[ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]]; then getmacs -D $$CN; fi
check:rc==0
cmd:makedhcp -n
@@ -80,11 +76,7 @@ check:rc==0
cmd:xdsh $$CN "cat /var/log/xcat/xcat.log"
cmd:xdsh $$CN "cat /test.synclist"
check:rc==0
cmd:service goconserver status
cmd:service conserver status
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:service goconserver status
cmd:service conserver status
cmd:if [[ -f /test.synclist.bak ]] ;then mv -f /test.synclist.bak /test.synclist;else rm -rf /test.synclist;fi
cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=
check:rc==0

29
xCAT-test/autotest/testcase/xcatconfig/case0
View File

@@ -120,8 +120,33 @@ cmd:rm -rf /tmp/xcatconfig.test
check:rc==0
cmd:rm -rf /etc/xcat/cabak /etc/xcat/certbak
check:rc==0
cmd:if service goconserver status; then echo "----->To restart goconserver"; service goconserver restart; sleep 10; echo "---------------------"; service goconserver status;echo "---------------------"; makegocons $$CN; fi
cmd:if service conserver status; then echo "---->To restart conserver"; service conserver restart;sleep 10;echo "---------------------"; service conserver status;echo "---------------------"; makeconservercf $$CN; fi
cmd:#!/bin/bash
rc=0
if service goconserver status;then
echo "----->goconserver is working, to restart goconserver"
service goconserver restart
sleep 5
echo "----->To check the status of goconserver"
if ! service goconserver status; then
rc=1
fi
echo "----->To enforce conserver stop"
service conserver stop
sleep 5
echo "----->To check the status of conserver"
if service conserver status; then
rc=1
fi
elif service conserver status;then
echo "----->conserver is working, to restart conserver"
service conserver restart
echo "----->To check the status of conserver"
if ! service conserver status; then
rc=1
fi
fi
exit $rc
check:rc==0
cmd:if lsdef service > /dev/null 2>&1; then updatenode service -P servicenode;fi
check:rc==0
cmd:if lsdef service > /dev/null 2>&1; then rpower $$CN stat;fi