From fd6d3a4cd75dc3ea13817331d0ead7b6e0f0e300 Mon Sep 17 00:00:00 2001 From: Wai Yee Wong Date: Tue, 28 Jul 2020 22:58:27 -0400 Subject: [PATCH 1/3] Add a separate test case to compare postscripts on MN and CN. --- .../autotest/bundle/rhels_ppcle_daily.bundle | 1 + .../autotest/bundle/rhels_ppcle_weekly.bundle | 1 + .../autotest/bundle/rhels_x86_daily.bundle | 1 + .../autotest/bundle/rhels_x86_weekly.bundle | 1 + .../autotest/bundle/sles_ppcle_daily.bundle | 1 + .../autotest/bundle/sles_ppcle_weekly.bundle | 1 + xCAT-test/autotest/bundle/sles_x86_daily.bundle | 1 + .../autotest/bundle/sles_x86_weekly.bundle | 1 + .../autotest/bundle/ubuntu_ppcle_daily.bundle | 1 + .../autotest/bundle/ubuntu_x86_daily.bundle | 1 + .../testcase/installation/compare_postscripts | 17 +++++++++++++++++ 11 files changed, 27 insertions(+) create mode 100644 xCAT-test/autotest/testcase/installation/compare_postscripts diff --git a/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle b/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle index 9c45ac82c..7d0fd3d3b 100644 --- a/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle @@ -2,6 +2,7 @@ SN_setup_case reg_linux_diskless_installation_hierarchy reg_linux_diskless_installation_hierarchy_squashfs reg_linux_diskfull_installation_hierarchy +compare_postscripts updatenode_P_script1 updatenode_P_script1_script2 updatenode_P_script2 diff --git a/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle index 996fe5c4d..0fc86d278 100644 --- a/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle +++ b/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle @@ -24,6 +24,7 @@ nodeset_cmdline nodeset_runimg nodeset_shell 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/rhels_x86_daily.bundle b/xCAT-test/autotest/bundle/rhels_x86_daily.bundle index 51c605833..ebb084bab 100644 --- a/xCAT-test/autotest/bundle/rhels_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_x86_daily.bundle @@ -2,6 +2,7 @@ SN_setup_case reg_linux_diskless_installation_hierarchy reg_linux_diskless_installation_hierarchy_squashfs reg_linux_diskfull_installation_hierarchy +compare_postscripts updatenode_P_script1 updatenode_P_script1_script2 updatenode_P_script2 diff --git a/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle b/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle index 3dcc8e1ee..6b39cbd14 100644 --- a/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle +++ b/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle @@ -24,6 +24,7 @@ nodeset_cmdline nodeset_runimg nodeset_shell 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_ppcle_daily.bundle b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle index 4579ab45b..a8cd4835e 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle @@ -2,6 +2,7 @@ SN_setup_case reg_linux_diskless_installation_hierarchy reg_linux_diskless_installation_hierarchy_squashfs reg_linux_diskfull_installation_hierarchy +compare_postscripts assign_certain_command_permission bmcdiscover_help bmcdiscover_q diff --git a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle index 388887cd4..ddfa86713 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle @@ -15,6 +15,7 @@ nodeset_cmdline nodeset_runimg nodeset_shell 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 ac69cd322..b4f20bab7 100644 --- a/xCAT-test/autotest/bundle/sles_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_daily.bundle @@ -2,6 +2,7 @@ SN_setup_case reg_linux_diskless_installation_hierarchy reg_linux_diskless_installation_hierarchy_squashfs reg_linux_diskfull_installation_hierarchy +compare_postscripts assign_certain_command_permission bmcdiscover_help bmcdiscover_q diff --git a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle index 76767fa1f..a523a0746 100644 --- a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle @@ -15,6 +15,7 @@ nodeset_cmdline nodeset_runimg nodeset_shell 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/ubuntu_ppcle_daily.bundle b/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle index 2ac01f264..983d59527 100644 --- a/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle @@ -1,6 +1,7 @@ reg_linux_diskless_installation_flat reg_linux_diskless_installation_flat_squashfs reg_linux_diskfull_installation_flat +compare_postscripts assign_certain_command_permission bmcdiscover_help bmcdiscover_q diff --git a/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle b/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle index 5e4ffac31..84f8f6968 100644 --- a/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle @@ -1,6 +1,7 @@ reg_linux_diskless_installation_flat reg_linux_diskless_installation_flat_squashfs reg_linux_diskfull_installation_flat +compare_postscripts assign_certain_command_permission bmcdiscover_help bmcdiscover_q diff --git a/xCAT-test/autotest/testcase/installation/compare_postscripts b/xCAT-test/autotest/testcase/installation/compare_postscripts new file mode 100644 index 000000000..499d47197 --- /dev/null +++ b/xCAT-test/autotest/testcase/installation/compare_postscripts @@ -0,0 +1,17 @@ +start:compare_postscripts +os:Linux +label:provision +cmd:cd /install/postscripts; tar cvf /tmp/sn.tar * +cmd: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: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 From 06382555502facd5f19ed38065ab05ed2aa1975d Mon Sep 17 00:00:00 2001 From: Wai Yee Wong Date: Wed, 29 Jul 2020 12:19:34 -0400 Subject: [PATCH 2/3] diff is done on MN. sn.tar is replaced by mn.tar. --- .../testcase/installation/compare_postscripts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/compare_postscripts b/xCAT-test/autotest/testcase/installation/compare_postscripts index 499d47197..190b8adf1 100644 --- a/xCAT-test/autotest/testcase/installation/compare_postscripts +++ b/xCAT-test/autotest/testcase/installation/compare_postscripts @@ -1,17 +1,16 @@ start:compare_postscripts os:Linux label:provision -cmd:cd /install/postscripts; tar cvf /tmp/sn.tar * -cmd:scp /tmp/sn.tar $$CN:/tmp +cmd:cd /install/postscripts; tar cvf /tmp/mn.tar * 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" +cmd:scp $$CN:/tmp/cn.tar /tmp; rm $$CN:/tmp/cn.tar +cmd:mkdir -p /tmp/mn; tar xvf /tmp/mn.tar -C /tmp/mn +cmd:mkdir -p /tmp/cn; tar xvf /tmp/cn.tar -C /tmp/cn; rm /tmp/cn/mypost* +cmd:diff -r /tmp/mn /tmp/cn > /tmp/diff.list check:rc==0 -cmd:xdsh $$CN "cat /tmp/diff.list" +cmd:cat /tmp/diff.list check:rc==0 -cmd:rm /tmp/sn.tar -cmd:xdsh $$CN "rm /tmp/cn.tar; rm -fr /tmp/sn; rm -fr /tmp/cn; rm /tmp/diff.list" +cmd:rm -fr /tmp/mn; rm -fr /tmp/cn; rm /tmp/diff.list" check:rc==0 end From 36478662a013be53cc73408a94456b0f0b90b936 Mon Sep 17 00:00:00 2001 From: Wai Yee Wong Date: Wed, 29 Jul 2020 13:30:26 -0400 Subject: [PATCH 3/3] Additional changes --- xCAT-test/autotest/testcase/installation/compare_postscripts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/compare_postscripts b/xCAT-test/autotest/testcase/installation/compare_postscripts index 190b8adf1..9ed9740a3 100644 --- a/xCAT-test/autotest/testcase/installation/compare_postscripts +++ b/xCAT-test/autotest/testcase/installation/compare_postscripts @@ -3,7 +3,8 @@ os:Linux label:provision cmd:cd /install/postscripts; tar cvf /tmp/mn.tar * cmd:xdsh $$CN "cd /xcatpost; tar cvf /tmp/cn.tar *" -cmd:scp $$CN:/tmp/cn.tar /tmp; rm $$CN:/tmp/cn.tar +cmd:scp $$CN:/tmp/cn.tar /tmp +cmd:xdsh $$CN "rm /tmp/cn.tar" cmd:mkdir -p /tmp/mn; tar xvf /tmp/mn.tar -C /tmp/mn cmd:mkdir -p /tmp/cn; tar xvf /tmp/cn.tar -C /tmp/cn; rm /tmp/cn/mypost* cmd:diff -r /tmp/mn /tmp/cn > /tmp/diff.list @@ -11,6 +12,6 @@ check:rc==0 cmd:cat /tmp/diff.list check:rc==0 -cmd:rm -fr /tmp/mn; rm -fr /tmp/cn; rm /tmp/diff.list" +cmd:rm -fr /tmp/mn; rm -fr /tmp/cn; rm /tmp/mn.tar; rm /tmp/diff.list" check:rc==0 end