From 7562214acac93ca4c2c5ec399cef8c229873a60b Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 15 Sep 2021 09:13:59 -0400
Subject: [PATCH] Add genimage/packimage to cleanup_postscripts_diskless
 testcase

---
 .../autotest/testcase/installation/compare_postscripts     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xCAT-test/autotest/testcase/installation/compare_postscripts b/xCAT-test/autotest/testcase/installation/compare_postscripts
index 8b4fdc732..c55a98b95 100644
--- a/xCAT-test/autotest/testcase/installation/compare_postscripts
+++ b/xCAT-test/autotest/testcase/installation/compare_postscripts
@@ -42,6 +42,11 @@ start:cleanup_postscripts_diskless
 os:Linux
 label:provision
 description: Verify postscripts cleaned up after diskless installation
+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
+cmd:genimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
 cmd:chdef -t site clustersite cleanupxcatpost="yes"
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/commoncmd/retry_install.sh  $$CN __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute 1
 check:rc==0
@@ -58,4 +63,6 @@ cmd:xdsh $$CN ls /xcatpost | wc -l
 check:rc==0
 check:output==0
 cmd:chdef -t site clustersite cleanupxcatpost="no"
+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