From 2f78873510e69692d2ae14f03cc48f73f9c793d0 Mon Sep 17 00:00:00 2001
From: peterwywong <46875219+peterwywong@users.noreply.github.com>
Date: Tue, 28 Jul 2020 11:03:28 -0500
Subject: [PATCH] Revert "Compare /install/postscripts/* on MN/SN and
 /xcatpost/* on CN and display the difference as part of the diskfull and
 diskless hierarchical provisionings."

---
 .../reg_linux_diskfull_installation_hierarchy      | 14 --------------
 .../reg_linux_diskless_installation_hierarchy      | 13 -------------
 2 files changed, 27 deletions(-)

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 3f2aa82f3..cfcd0832a 100644
--- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
+++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
@@ -58,16 +58,6 @@ check:output=~Provision node\(s\)\: $$CN
 cmd:xdsh $$SN "if [[ -f /var/lib/dhcp/db/dhcpd.leases ]]; then cat /var/lib/dhcp/db/dhcpd.leases; elif [[ -f /var/lib/dhcpd/dhcpd.leases ]];then cat /var/lib/dhcpd/dhcpd.leases;elif [[ -f /var/lib/dhcp/dhcpd.leases ]];then cat /var/lib/dhcp/dhcpd.leases; fi"
 cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc" ]]; then sleep 120;elif [[ "__GETNODEATTR($$CN,arch)__" =~ "x86_64" ]];then sleep 200;else sleep 180;fi
 
-cmd:xdsh $$SN "cd /install/postscripts; tar cvf /tmp/sn.tar *"
-cmd:xdsh $$SN "scp /tmp/sn.tar $$CN:/tmp"
-cmd:xdsh $$CN "cd /xcatpost; tar cvf /tmp/cn.tar *"
-cmd:xdsh $$CN "mkdir -p /tmp/sn; tar xvf /tmp/sn.tar -C /tmp/sn"
-cmd:xdsh $$CN "mkdir -p /tmp/cn; tar xvf /tmp/cn.tar -C /tmp/cn; rm -f /tmp/cn/mypost*"
-cmd:xdsh $$CN "diff -r /tmp/sn /tmp/cn > /tmp/diff.list"
-check:rc==0
-cmd:xdsh $$CN "cat /tmp/diff.list"
-check:rc==0
-
 #cmd:lsdef -l $$CN | grep status
 #check:rc==0
 #check:output!~booted
@@ -110,8 +100,4 @@ cmd:xdsh $$CN "cd /xcatpost; rmdir -p dir1/dir2/dir3"
 check:rc==0
 cmd:chdef -m -t node -o $$CN postscripts="dir1/dir2/dir3/foo.bar"
 check:rc==0
-
-cmd:xdsh $$SN "rm /tmp/sn.tar"
-cmd:xdsh $$CN "rm /tmp/cn.tar; rm -fr /tmp/sn; rm -fr /tmp/cn; rm /tmp/diff.list"
-check:rc==0
 end
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 496f62ee0..5586630d4 100644
--- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy
+++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy
@@ -64,16 +64,6 @@ check:output=~Provision node\(s\)\: $$CN
 
 cmd:xdsh $$SN "if [[ -f /var/lib/dhcp/db/dhcpd.leases ]]; then cat /var/lib/dhcp/db/dhcpd.leases; elif [[ -f /var/lib/dhcpd/dhcpd.leases ]];then cat /var/lib/dhcpd/dhcpd.leases;elif [[ -f /var/lib/dhcp/dhcpd.leases ]];then cat /var/lib/dhcp/dhcpd.leases; fi"
 
-cmd:xdsh $$SN "cd /install/postscripts; tar cvf /tmp/sn.tar *"
-cmd:xdsh $$SN "scp /tmp/sn.tar $$CN:/tmp"
-cmd:xdsh $$CN "cd /xcatpost; tar cvf /tmp/cn.tar *"
-cmd:xdsh $$CN "mkdir -p /tmp/sn; tar xvf /tmp/sn.tar -C /tmp/sn"
-cmd:xdsh $$CN "mkdir -p /tmp/cn; tar xvf /tmp/cn.tar -C /tmp/cn; rm -f /tmp/cn/mypost*"
-cmd:xdsh $$CN "diff -r /tmp/sn /tmp/cn > /tmp/diff.list"
-check:rc==0
-cmd:xdsh $$CN "cat /tmp/diff.list"
-check:rc==0
-
 cmd:ping $$CN -c 3
 check:rc==0
 check:output=~64 bytes from $$CN
@@ -117,9 +107,6 @@ cmd:xdsh $$CN "cd /xcatpost; rmdir -p dir1/dir2/dir3"
 check:rc==0
 cmd:chdef -m -t node -o $$CN postscripts="dir1/dir2/dir3/foo.bar"
 check:rc==0
-cmd:xdsh $$SN "rm /tmp/sn.tar"
-cmd:xdsh $$CN "rm /tmp/cn.tar; rm -fr /tmp/sn; rm -fr /tmp/cn; rm /tmp/diff.list"
-check:rc==0
 end
 
 start:reg_linux_diskless_installation_hierarchy_squashfs