From 602083bcc2be3f9074bd0940d4a24667f9f70e67 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Wed, 7 Nov 2018 21:15:48 -0500 Subject: [PATCH] fix issue 5724, adjust cases list to avoid some cases false failure --- xCAT-test/autotest/bundle/pegas_ppc64le.bundle | 12 ++++++------ xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle | 8 ++++---- xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle | 8 ++++---- xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle | 8 ++++---- xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle | 10 ++++++---- xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle | 8 ++++---- xCAT-test/autotest/bundle/sles11.4_ppc64.bundle | 4 ++-- xCAT-test/autotest/bundle/sles11.4_x86_64.bundle | 8 ++++---- xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle | 12 ++++++------ xCAT-test/autotest/bundle/sles12.2_x86_64.bundle | 4 ++-- .../autotest/bundle/ubuntu16.04.1_ppc64le.bundle | 12 ++++++------ .../autotest/bundle/ubuntu16.04.1_x86_64.bundle | 12 ++++++------ 12 files changed, 54 insertions(+), 52 deletions(-) diff --git a/xCAT-test/autotest/bundle/pegas_ppc64le.bundle b/xCAT-test/autotest/bundle/pegas_ppc64le.bundle index 884d5453e..c7ae81ad6 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle index c782fe9f1..b1137d0bf 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle index 331edf666..95a28f122 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle index bb5016a0d..060343ce4 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle index 1dacbd5cf..e458f98cf 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle index 7324d4b32..463675df4 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle index d129a70cb..93a61d8e9 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle index 8a5bcdd14..984deb670 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle index e424b8db1..72dd12d00 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle index 9fc44f715..e76d2d630 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle index 9a8f49bf5..e75157e51 100644 --- 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 diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle index a8bee6335..5c755deab 100644 --- 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