From a8ef70dea6d37bb82b96d6595e1d2b4d6ff3d4c5 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Mon, 3 May 2021 10:46:22 -0400 Subject: [PATCH 1/2] Regression testcase improvements --- xCAT-test/autotest/bundle/sles_ppcle_daily.bundle | 1 + xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle | 1 - xCAT-test/autotest/bundle/sles_x86_daily.bundle | 1 + xCAT-test/autotest/bundle/sles_x86_weekly.bundle | 1 - .../installation/reg_linux_diskless_installation_hierarchy | 6 ++++++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle index 3a0443bda..f904d1a1b 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle @@ -253,3 +253,4 @@ xcatstanzafile_objtype xcatstanzafile_specificvalue xcatstanzafile_tab go_xcat_devel_from_repo +reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle index ddfa86713..f023a4d57 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle @@ -18,4 +18,3 @@ reg_linux_diskfull_installation_flat compare_postscripts reg_linux_diskless_installation_flat reg_linux_diskless_installation_flat_squashfs -reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/sles_x86_daily.bundle b/xCAT-test/autotest/bundle/sles_x86_daily.bundle index 0b1d3e307..f46da8963 100644 --- a/xCAT-test/autotest/bundle/sles_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_daily.bundle @@ -252,3 +252,4 @@ xcatstanzafile_objtype xcatstanzafile_specificvalue xcatstanzafile_tab go_xcat_devel_from_repo +reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle index a523a0746..d0859c03f 100644 --- a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle @@ -18,4 +18,3 @@ reg_linux_diskfull_installation_flat compare_postscripts reg_linux_diskless_installation_flat reg_linux_diskless_installation_flat_squashfs -reg_linux_statelite_installation_flat 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 f05480679..09fca6e28 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy @@ -107,6 +107,9 @@ 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 +# Remove diskless image to free up disk space +cmd:rmimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute +check:rc==0 end start:reg_linux_diskless_installation_hierarchy_squashfs @@ -206,5 +209,8 @@ cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconserverc 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 +# Remove diskless image to free up disk space +cmd:rmimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute +check:rc==0 end From 90b37073413e700f1f1448667cd41f253a84afd4 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Tue, 4 May 2021 14:00:14 -0400 Subject: [PATCH 2/2] Undo bundle changes --- xCAT-test/autotest/bundle/sles_ppcle_daily.bundle | 1 - xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle | 1 + xCAT-test/autotest/bundle/sles_x86_daily.bundle | 1 - xCAT-test/autotest/bundle/sles_x86_weekly.bundle | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle index f904d1a1b..3a0443bda 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle @@ -253,4 +253,3 @@ xcatstanzafile_objtype xcatstanzafile_specificvalue xcatstanzafile_tab go_xcat_devel_from_repo -reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle index f023a4d57..ddfa86713 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle @@ -18,3 +18,4 @@ reg_linux_diskfull_installation_flat compare_postscripts reg_linux_diskless_installation_flat reg_linux_diskless_installation_flat_squashfs +reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/sles_x86_daily.bundle b/xCAT-test/autotest/bundle/sles_x86_daily.bundle index f46da8963..0b1d3e307 100644 --- a/xCAT-test/autotest/bundle/sles_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_daily.bundle @@ -252,4 +252,3 @@ xcatstanzafile_objtype xcatstanzafile_specificvalue xcatstanzafile_tab go_xcat_devel_from_repo -reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle index d0859c03f..a523a0746 100644 --- a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle @@ -18,3 +18,4 @@ reg_linux_diskfull_installation_flat compare_postscripts reg_linux_diskless_installation_flat reg_linux_diskless_installation_flat_squashfs +reg_linux_statelite_installation_flat