Merge pull request #2256 from xcat2/master

merge changes from master to 2.13 branch for 2.13 release.(5+)

xCAT-server/share/xcat/netboot/rh/dracut_033/xcat-prepivot.sh

@@ -66,7 +66,7 @@ if [ ! -z $SNAPSHOTSERVER ]; then
             /bin/sh
             exit
         fi
-        RS= $(( $RANDOM % 20 ))
+        RS=$(( $RANDOM % 20 ))
         echo "Trying again in $RS seconds..."
         sleep $RS
     done
@@ -83,7 +83,7 @@ if [ ! -z $SNAPSHOTSERVER ]; then
             /bin/sh
             exit
         fi
-        RS= $(( $RANDOM % 20 ))
+        RS=$(( $RANDOM % 20 ))
         echo "Trying again in $RS seconds..."
         sleep $RS
     done
@@ -98,7 +98,7 @@ if [ ! -z $SNAPSHOTSERVER ]; then
             /bin/sh
             exit
         fi
-        RS= $(( $RANDOM % 20 ))
+        RS=$(( $RANDOM % 20 ))
         echo "Trying again in $RS seconds..."
         sleep $RS
     done

xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot

@@ -212,7 +212,7 @@ elif [ -r /rootimg-statelite.gz ]; then
             /bin/sh
             exit
         fi
-        RS= $(( $RANDOM % 20 ))
+        RS=$(( $RANDOM % 20 ))
         echo "Trying again in $RS seconds..."
         sleep $RS
     done
@@ -227,7 +227,7 @@ elif [ -r /rootimg-statelite.gz ]; then
             /bin/sh
             exit
         fi
-        RS= $(( $RANDOM % 20 ))
+        RS=$(( $RANDOM % 20 ))
         echo "Trying again in $RS seconds..."
         sleep $RS
     done

xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le

@@ -17,6 +17,9 @@ cmd:makedhcp -a
 check:rc==0
 cmd:makeconservercf $$CN
 check:rc==0
+cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
+check:rc==0
+
 cmd:if cat /etc/*release |grep SUSE >/dev/null;then if [ ! -d /install/custom/netboot/sles ]; then mkdir -p /install/custom/netboot/sles; fi; elif cat /etc/*release |grep "Red Hat" >/dev/null;then if [ ! -d /install/custom/netboot/rh ]; then mkdir -p /install/custom/netboot/rh; fi; elif cat /etc/*release |grep "Ubuntu"  >/dev/null;then if   [ ! -d /install/custom/netboot/ubuntu ]; then mkdir -p /install/custom/netboot/ubuntu; fi; fi
 check:rc==0
 cmd:if cat /etc/*release |grep SUSE >/dev/null;then if [ ! -e /install/custom/netboot/sles/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/sles/compute.synclist; fi; elif cat /etc/*release |grep "Red Hat" >/dev/null;then if [ ! -e /install/custom/netboot/rh/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/rh/compute.synclist; fi; elif cat /etc/*release |grep "Ubuntu"  >/dev/null;then if  [ ! -e /install/custom/netboot/ubuntu/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/ubuntu/compute.synclist;fi; fi
@@ -61,4 +64,7 @@ check:output=~booted
 cmd:xdsh $$CN date
 check:rc==0
 check:output=~\d\d:\d\d:\d\d
+cmd:rootimgdir=`lsdef -t osimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
+check:rc==0
+
 end

xCAT-test/autotest/testcase/installation/litefile.csv

@@ -14,7 +14,6 @@
 "ALL","/etc/sysconfig/","tmpfs",,
 "ALL","/etc/ssh/","tmpfs",,
 "ALL","/etc/systemd/system/multi-user.target.wants/","tmpfs",,
-"ALL","/usr/lib/systemd/system/ntpd.service","tmpfs",,
 "ALL","/tmp/","tmpfs",,
 "ALL","/var/","tmpfs",,
 "ALL","/opt/xcat/","tmpfs",,

xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat

@@ -129,6 +129,4 @@ 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
-cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute
-check:rc==0
 end

xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs

@@ -93,6 +93,4 @@ check:output=~compute/rootimg on / type nfs
 
 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
-cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute
-check:rc==0
 end

xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk

@@ -95,6 +95,4 @@ check:output=~rootfs on / type
 
 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
-cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute
-check:rc==0
 end

xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm

@@ -17,7 +17,7 @@ cmd:makedhcp -a
 check:rc==0
 cmd:makeconservercf $$CN
 check:rc==0
-cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/x86_64/compute
+cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
 check:rc==0
 cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
@@ -44,4 +44,6 @@ check:output=~booted
 cmd:xdsh $$CN date
 check:rc==0
 check:output=~\d\d:\d\d:\d\d
+cmd:rootimgdir=`lsdef -t osimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
+check:rc==0
 end