Merge pull request #5776 from tingtli/issue5724

fix issue 5724, adjust cases list to avoid some cases false failure
2025-10-31 19:32:31 +00:00 · 2018-11-15 11:10:50 +08:00
parent 19c5ab3f49 602083bcc2
commit 80be4ea1fa
12 changed files with 54 additions and 52 deletions
--- a/xCAT-test/autotest/bundle/pegas_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/pegas_ppc64le.bundle
@@ -269,8 +269,6 @@ makentp_v
 makentp_h
 nodeset_check_warninginfo
 runcmdinstaller_h
-runcmdinstaller_command
-get_xcat_postscripts_loginfo
 updatenode_postscripts_loginfo
 xcatd_start
 xcatd_stop
@@ -311,10 +309,6 @@ rmimage_diskless
 updatenode_diskful_syncfiles_failing
 xdcp_nonroot_user
 xdsh_permission_denied
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_xz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 confignetwork_vlan_false
@@ -322,6 +316,12 @@ confignetwork__bridge_false
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
@@ -272,8 +272,6 @@ makentp_v
 makentp_h
 nodeset_check_warninginfo
 runcmdinstaller_h
-runcmdinstaller_command
-get_xcat_postscripts_loginfo
 updatenode_postscripts_loginfo
 bmcdiscover_h
 bmcdiscover_nmap_range
@@ -312,12 +310,14 @@ updatenode_diskful_syncfiles_failing
 xdcp_nonroot_user
 xdsh_permission_denied
 reg_linux_diskless_installation_flat
+packimage_m_invalid_archive_method
+packimage_m_invalid_compress_method
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
 packimage_m_tar_c_gzip
 packimage_m_tar_c_xz
-packimage_m_invalid_archive_method
-packimage_m_invalid_compress_method
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle
@@ -234,10 +234,6 @@ updatenode_diskful_syncfiles_failing
 xdcp_nonroot_user
 xdsh_permission_denied
 reg_linux_diskless_installation_flat
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_xz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 confignetwork_vlan_false
@@ -245,6 +241,10 @@ confignetwork__bridge_false
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle
@@ -315,8 +315,6 @@ makentp_v
 makentp_h
 nodeset_check_warninginfo
 runcmdinstaller_h
-runcmdinstaller_command
-get_xcat_postscripts_loginfo
 updatenode_postscripts_loginfo
 bmcdiscover_h
 bmcdiscover_nmap_range
@@ -356,12 +354,14 @@ updatenode_diskful_syncfiles_failing
 xdcp_nonroot_user
 xdsh_permission_denied
 reg_linux_diskless_installation_flat
+packimage_m_invalid_archive_method
+packimage_m_invalid_compress_method
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
 packimage_m_tar_c_gzip
 packimage_m_tar_c_xz
-packimage_m_invalid_archive_method
-packimage_m_invalid_compress_method
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle
@@ -357,10 +357,6 @@ rmimage_diskless
 updatenode_diskful_syncfiles_failing
 xdcp_nonroot_user
 xdsh_permission_denied
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_xz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 confignetwork_vlan_false
@@ -368,6 +364,12 @@ confignetwork__bridge_false
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle
@@ -38,10 +38,6 @@ packimage_o_p_a_m
 packimage_imagename
 packimage_h
 packimage_v
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_xz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 pping_h
@@ -298,6 +294,10 @@ confignetwork__bridge_false
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
 reg_linux_diskless_installation_flat
 reg_linux_statelite_installation_flat
 SN_setup_case
--- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
@@ -279,12 +279,12 @@ updatenode_diskful_syncfiles_failing
 xdcp_nonroot_user
 xdsh_permission_denied
 reg_linux_diskless_installation_flat
+packimage_m_invalid_archive_method
+packimage_m_invalid_compress_method
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
 packimage_m_tar_c_gzip
 packimage_m_tar_c_xz
-packimage_m_invalid_archive_method
-packimage_m_invalid_compress_method
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
@@ -237,15 +237,15 @@ updatenode_diskful_syncfiles_failing
 xdcp_nonroot_user
 xdsh_permission_denied
 reg_linux_diskless_installation_flat
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_xz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -34,12 +34,6 @@ packimage_o_p_a_m
 packimage_imagename
 packimage_h
 packimage_v
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_pigz
-packimage_m_cpio_c_xz
-packimage_m_tar_c_pigz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 pping_h
@@ -254,6 +248,12 @@ xdsh_permission_denied
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_pigz
+packimage_m_cpio_c_xz
+packimage_m_tar_c_pigz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
 sles_migration1
 sles_migration2
 reg_linux_statelite_installation_flat
--- a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
@@ -253,14 +253,14 @@ nodeset_runimg
 sles_migration1
 sles_migration2
 reg_linux_diskless_installation_flat
+packimage_m_invalid_archive_method
+packimage_m_invalid_compress_method
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_pigz
 packimage_m_cpio_c_xz
 packimage_m_tar_c_pigz
 packimage_m_tar_c_gzip
 packimage_m_tar_c_xz
-packimage_m_invalid_archive_method
-packimage_m_invalid_compress_method
 reg_linux_statelite_installation_flat
 SN_setup_case
 reg_linux_diskfull_installation_hierarchy
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
@@ -25,12 +25,6 @@ packimage_o_p_a_m
 packimage_imagename
 packimage_h
 packimage_v
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_pigz
-packimage_m_cpio_c_xz
-packimage_m_tar_c_pigz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 pping_h
@@ -242,6 +236,12 @@ xdsh_permission_denied
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_pigz
+packimage_m_cpio_c_xz
+packimage_m_tar_c_pigz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
 ubuntu_migration1_p8le
 ubuntu_migration2_p8le

--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
@@ -21,12 +21,6 @@ packimage_o_p_a_m
 packimage_imagename
 packimage_h
 packimage_v
-packimage_m_cpio_c_gzip
-packimage_m_cpio_c_pigz
-packimage_m_cpio_c_xz
-packimage_m_tar_c_pigz
-packimage_m_tar_c_gzip
-packimage_m_tar_c_xz
 packimage_m_invalid_archive_method
 packimage_m_invalid_compress_method
 pping_h
@@ -239,5 +233,11 @@ xdsh_permission_denied
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_pigz
+packimage_m_cpio_c_xz
+packimage_m_tar_c_pigz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
 ubuntu_migration1_vm
 ubuntu_migration2_vm