From df8ae5bd9adb4a78bd678cdf9f2173afefc389d6 Mon Sep 17 00:00:00 2001 From: huweihua Date: Wed, 16 May 2018 23:11:04 -0400 Subject: [PATCH 1/2] Revert "Further modification for adding test case for 922 (#5193)" This reverts commit 326144f92e1e29e6633063e52bac3b1f46c1b3f2. --- .../installation/reg_linux_statelite_installation_flat | 6 ++++-- .../reg_linux_statelite_installation_hierarchy_by_nfs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat index 54d600128..a3d62e710 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat @@ -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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs index 90d929feb..27e0b4439 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs @@ -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 From 4763f1b6b27112f1477890167fe364f38d31ffc9 Mon Sep 17 00:00:00 2001 From: huweihua Date: Wed, 16 May 2018 23:11:26 -0400 Subject: [PATCH 2/2] Revert "add test for issue 922 (#5179)" This reverts commit 21a138502a14efbc9debd8ab591fadc315ca0160. --- .../reg_linux_diskfull_installation_flat | 10 ---------- .../reg_linux_diskfull_installation_hierarchy | 10 ---------- .../reg_linux_diskless_installation_flat | 10 ---------- .../reg_linux_diskless_installation_hierarchy | 10 ---------- .../reg_linux_statelite_installation_flat | 20 ------------------- ...ux_statelite_installation_hierarchy_by_nfs | 10 ---------- ...tatelite_installation_hierarchy_by_ramdisk | 10 ---------- 7 files changed, 80 deletions(-) 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 a7efa1b19..be95f5d86 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -71,16 +71,6 @@ check:output=~64 bytes from $$CN cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" cmd:xdsh $$CN "cat /test.synclist" check:rc==0 -#add test for issue922 -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:if [[ -f /test.synclist.bak ]] ;then mv -f /test.synclist.bak /tmp/test.synclist;else rm -rf /test.synclist;fi cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists= end 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 c9b3a9a45..a21b71002 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy @@ -68,16 +68,6 @@ check:rc==0 cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" cmd:xdsh $$CN "cat /test.synclist" check:rc==0 -#add test for issue922 -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: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)__-install-compute synclists= end 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 1dc6fdc8a..6fde471d5 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat @@ -72,16 +72,6 @@ check:rc==0 cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" cmd:xdsh $$CN "cat /test.synclist" check:rc==0 -#add test for issue922 -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: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 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 585a76a21..d846fca5a 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy @@ -73,16 +73,6 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar check:rc==0 cmd:xdsh $$CN "cat /test.synclist" check:rc==0 -#add test for issue922 -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: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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat index a3d62e710..de1331b54 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat @@ -81,16 +81,6 @@ check:output=~$$CN: $$CN cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" cmd:xdsh $$CN "echo "test"> /test.statelite" check:rc!=0 -#add test for issue922 -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 @@ -131,16 +121,6 @@ cmd:ping $$CN -c 3 check:rc==0 check:output=~64 bytes from $$CN cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" -#add test for issue922 -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:rm -rf /tmp/image;mkdir /tmp/image check:rc==0 cmd:imgexport __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute /tmp/image/image.tgz diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs index 27e0b4439..802491f64 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs @@ -101,16 +101,6 @@ check:output=~$$CN: $$CN cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" cmd:xdsh $$CN "echo "test"> /test.statelite" check:rc!=0 -#add test for issue922 -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 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk index 8c335a5c9..c61e15ac2 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk @@ -93,16 +93,6 @@ cmd:xdsh $$CN hostname check:rc==0 check:output=~$$CN: $$CN cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" -#add test for issue922 -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:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 end