2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-21 05:25:32 +00:00

Revert "Further modification for adding test case for 922 (#5193)"

This reverts commit 326144f92e.
This commit is contained in:
huweihua
2018-05-16 23:11:04 -04:00
parent 668a00bd71
commit df8ae5bd9a
2 changed files with 8 additions and 4 deletions

View File

@ -51,8 +51,6 @@ check:rc==0
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute
check:rc==0
cmd:rootimagedir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute -i rootimgdir -c|awk -F"=" '{print $2}'`; chroot $rootimagedir/rootimg useradd xcatuser
check:rc==0
cmd:liteimg __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute
check:rc==0
@ -87,8 +85,12 @@ check:rc!=0
cmd:xdsh $$CN "ls -l /bin/ping"
cmd:xdsh $$CN "ping -c 1 127.0.0.1"
check:rc==0
cmd:xdsh $$CN "useradd -m xcatuser"
check:rc==0
cmd:xdsh $$CN "su - xcatuser sh -c \"ping -c 1 127.0.0.1\""
check:rc==0
cmd:xdsh $$CN "userdel xcatuser"
check:rc==0
cmd:output=$(xdsh $$CN ls -al / |grep test.statelite);if [[ $? -eq 0 ]];then xdsh $$CN rm -rf /test.tatelite;fi
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then rm -rf $rootimgdir;fi
check:rc==0

View File

@ -69,8 +69,6 @@ check:rc==0
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute
check:rc==0
cmd:rootimagedir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute -i rootimgdir -c|awk -F"=" '{print $2}'`; chroot $rootimagedir/rootimg useradd xcatuser
check:rc==0
cmd:liteimg __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute
check:rc==0
cmd:prsync /install $$SN:/
@ -107,8 +105,12 @@ check:rc!=0
cmd:xdsh $$CN "ls -l /bin/ping"
cmd:xdsh $$CN "ping -c 1 127.0.0.1"
check:rc==0
cmd:xdsh $$CN "useradd -m xcatuser"
check:rc==0
cmd:xdsh $$CN "su - xcatuser sh -c \"ping -c 1 127.0.0.1\""
check:rc==0
cmd:xdsh $$CN "userdel xcatuser"
check:rc==0
cmd:output=$(xdsh $$CN ls -al / |grep test.statelite);if [[ $? -eq 0 ]];then xdsh $$CN rm -rf /test.tatelite;fi
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then rm -rf $rootimgdir;fi
check:rc==0