From 18232f39175d923c5c22fd05841aeefe5884f0ed Mon Sep 17 00:00:00 2001 From: Weihua Hu Date: Thu, 17 May 2018 11:20:39 +0800 Subject: [PATCH] Revert "Remove non-root user test from statelite provision" (#5222) --- .../reg_linux_statelite_installation_flat | 32 +++++++++---------- ...ux_statelite_installation_hierarchy_by_nfs | 14 ++++---- ...tatelite_installation_hierarchy_by_ramdisk | 18 +++++------ 3 files changed, 32 insertions(+), 32 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 80253c043..54d600128 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,8 @@ 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: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 @@ -84,11 +84,11 @@ 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 "su - xcatuser sh -c \"ping -c 1 127.0.0.1\"" -#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 "su - xcatuser sh -c \"ping -c 1 127.0.0.1\"" +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 @@ -130,15 +130,15 @@ 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: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 41b49728d..90d929feb 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,8 @@ 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: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:/ @@ -104,11 +104,11 @@ 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 "su - xcatuser sh -c \"ping -c 1 127.0.0.1\"" -#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 "su - xcatuser sh -c \"ping -c 1 127.0.0.1\"" +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 ccf4d48f5..8c335a5c9 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 @@ -94,15 +94,15 @@ 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: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