diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
new file mode 100644
index 000000000..3d02946bd
--- /dev/null
+++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
@@ -0,0 +1,320 @@
+reg_linux_diskfull_installation_flat
+go_xcat_local_repo_case7
+go_xcat_noinput
+go_xcat_with_x
+go_xcat_with_xcat-version-1
+go_xcat_online_repo_case6
+updatenode_h
+updatenode_v
+updatenode_diskful_syncfiles
+updatenode_diskful_syncfiles_rename
+updatenode_diskful_syncfiles_dir
+updatenode_diskful_syncfiles_multi_files
+updatenode_syncfile_EXECUTE
+updatenode_syncfile_EXECUTEALWAYS
+updatenode_syncfile_APPEND
+updatenode_syncfile_MERGE
+updatenode_P_script1
+updatenode_P_script2
+updatenode_f_incompatible_flags
+updatenode_k_incompatible_flags
+updatenode_diskful_syncfiles_P_script1
+updatenode_script3
+updatenode_P_script1_script2
+updatenode_without_flag
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+getmacs_noderange
+getmacs_d
+getmacs_f_D
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_bus
+rinv_config
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rscan_noderange
+rscan_x
+rscan_z
+rscan_w
+rscan_x_w
+rscan_z_w
+rvitals_lcds
+rvitals_all
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_h
+makehosts_help
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehosts_n_noderange
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+confignics_config_one_port_single_value
+confignics_config_multiple_ports_single_value
+confignics_config_multiple_ports_multiple_value
+confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
+confignics_config_multiple_port_withnicaliases_multiple_value
+confignics_disable_set_to_yes
+confignics_disable_set_to_1
+confignics_s
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+psh_h
+psh_v
+psh_node_cmd_linux
+psh_l
+psh_i
+prsync_h
+prsync_v
+prsync_dir_node
+prsync_file_node
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+makentp_v
+makentp_h
+nodeset_check_warninginfo
+runcmdinstaller_h
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
+updatenode_postscripts_loginfo
+bmcdiscover_h
+bmcdiscover_nmap_range
+bmcdiscover_v
+bmcdiscover_check_paswd
+bmcdiscover_check_passwd_wrong
+bmcdiscover_get_ipsource
+bmcdiscover_range_w
+bmcdiscover_range_z
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+xcatconfig_u_check_xcatsslversion_rhels_sles
+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
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle
new file mode 100644
index 000000000..bd2907ad7
--- /dev/null
+++ b/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle
@@ -0,0 +1,230 @@
+setup_vm
+reg_linux_diskfull_installation_flat
+go_xcat_local_repo_case7
+go_xcat_noinput
+go_xcat_with_x
+go_xcat_with_xcat-version-1
+go_xcat_online_repo_case6
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+psh_h
+psh_v
+psh_node_cmd_linux
+psh_l
+psh_i
+prsync_h
+prsync_v
+prsync_dir_node
+prsync_file_node
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+nodeset_check_warninginfo
+xcatconfig_u_check_xcatsslversion_rhels_sles
+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
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+clean_up_env