From 4cafcfe310503290287a8a37d076188397f76181 Mon Sep 17 00:00:00 2001 From: Junxiaw Date: Thu, 5 Feb 2015 03:09:50 -0800 Subject: [PATCH 1/2] modify bundlelist --- xCAT-test/autotest/bundle/x_rhels_cmd.bundle | 31 ------------------- xCAT-test/autotest/bundle/x_sles_cmd.bundle | 30 ------------------ xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle | 29 +++-------------- 3 files changed, 4 insertions(+), 86 deletions(-) diff --git a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle index 56f7e6b08..5180c6a49 100644 --- a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle +++ b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle @@ -3,15 +3,9 @@ makehosts_help makehosts_n makehosts_n_noderange chdef_null -chdef_t_o_attr -chdef_p_t_o_attr -chdef_m_t_o_attr chdef_z -chdef_t_o_attr_noderange chdef_t_o_error chtab_null -chtab_delete -chtab_modify chtab_d chtab_modify_node chtab_modify_key @@ -24,7 +18,6 @@ packimage_h packimage_v pping_h pping_v -pping_all pping_node gettab_key_table gettab_H @@ -49,8 +42,6 @@ makedhcp_a makedhcp_a_d makedhcp_d mkdef_null -mkdef_t_o_attr -mkdef_f_t_o_attr mkdef_z mkdef_t_o_error nodeadd_noderange @@ -68,7 +59,6 @@ nodech_noderange_table_comma nodech_noderange_table_arrow nodech_noderanage_table_at nodech_delete -nodech_delete_error nodech_error_node nodech_error_table nodech_h @@ -117,27 +107,10 @@ nodeset_stat nodeset_noderange nodestat_noderange nodestat_err_node -rinv_null -rinv_bus -rinv_config -rinv_serial -rinv_model -rinv_firm -rinv_all rinv_noderange_err rmdef_null -rmdef_t_o_attr -rmdef_f_all rmdef_t_err rpower_err_noderange -rscan_noderange -rscan_x -rscan_z -rscan_w -rscan_x_w -rscan_z_w -mvitals_state -rvitals_lcds rvitals_noderange_err tabdump_table tabdump_d @@ -179,7 +152,6 @@ dumpxCATdb_a_p_nullskiptables_V dumpxCATdb_p_V restorexCAT_h restorexCATdb_v -restorexCATdb_p restorexCATdb_p_V restorexCATdb_a_p_V restorexCATdb_wrongpath @@ -196,10 +168,7 @@ lsxcatd_null lsxcatd_h lsxcatd_d lsxcatd_a -xcatstart -xcatstop xdcp_P -makedns_n_node makedns_d_node makedns_n makedns diff --git a/xCAT-test/autotest/bundle/x_sles_cmd.bundle b/xCAT-test/autotest/bundle/x_sles_cmd.bundle index 0c3672e90..fd1d4ff89 100644 --- a/xCAT-test/autotest/bundle/x_sles_cmd.bundle +++ b/xCAT-test/autotest/bundle/x_sles_cmd.bundle @@ -3,15 +3,9 @@ makehosts_help makehosts_n makehosts_n_noderange chdef_null -chdef_t_o_attr -chdef_p_t_o_attr -chdef_m_t_o_attr chdef_z -chdef_t_o_attr_noderange chdef_t_o_error chtab_null -chtab_delete -chtab_modify chtab_d chtab_modify_node chtab_modify_key @@ -50,8 +44,6 @@ makedhcp_a makedhcp_a_d makedhcp_d mkdef_null -mkdef_t_o_attr -mkdef_f_t_o_attr mkdef_z mkdef_t_o_error nodeadd_noderange @@ -69,7 +61,6 @@ nodech_noderange_table_comma nodech_noderange_table_arrow nodech_noderanage_table_at nodech_delete -nodech_delete_error nodech_error_node nodech_error_table nodech_h @@ -118,27 +109,10 @@ nodeset_stat nodeset_noderange nodestat_noderange nodestat_err_node -rinv_null -rinv_bus -rinv_config -rinv_serial -rinv_model -rinv_firm -rinv_all rinv_noderange_err rmdef_null -rmdef_t_o_attr -rmdef_f_all rmdef_t_err rpower_err_noderange -rscan_noderange -rscan_x -rscan_z -rscan_w -rscan_x_w -rscan_z_w -mvitals_state -rvitals_lcds rvitals_noderange_err tabdump_table tabdump_d @@ -180,7 +154,6 @@ dumpxCATdb_a_p_nullskiptables_V dumpxCATdb_p_V restorexCAT_h restorexCATdb_v -restorexCATdb_p restorexCATdb_p_V restorexCATdb_a_p_V restorexCATdb_wrongpath @@ -197,9 +170,6 @@ lsxcatd_null lsxcatd_h lsxcatd_d lsxcatd_a -xcatstart -xcatstop -xdcp_P makedns_n_node makedns_d_node makedns_n diff --git a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle index 12db1ed44..835b8b802 100644 --- a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle +++ b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle @@ -3,15 +3,9 @@ makehosts_help makehosts_n makehosts_n_noderange chdef_null -chdef_t_o_attr -chdef_p_t_o_attr -chdef_m_t_o_attr chdef_z -chdef_t_o_attr_noderange chdef_t_o_error chtab_null -chtab_delete -chtab_modify chtab_d chtab_modify_node chtab_modify_key @@ -45,11 +39,8 @@ makeconservercf_noderange makeconservercf_d makedhcp_n makedhcp_a_ubuntu -makedhcp_a_ubuntu_d makedhcp_d mkdef_null -mkdef_t_o_attr -mkdef_f_t_o_attr mkdef_z mkdef_t_o_error nodeadd_noderange @@ -67,7 +58,6 @@ nodech_noderange_table_comma nodech_noderange_table_arrow nodech_noderanage_table_at nodech_delete -nodech_delete_error nodech_error_node nodech_error_table nodech_h @@ -117,18 +107,8 @@ nodeset_noderange nodestat_noderange nodestat_err_node rmdef_null -rmdef_t_o_attr -rmdef_f_all rmdef_t_err rpower_err_noderange -rscan_noderange -rscan_x -rscan_z -rscan_w -rscan_x_w -rscan_z_w -mvitals_state -rvitals_lcds rvitals_noderange_err tabdump_table tabdump_d @@ -170,7 +150,6 @@ dumpxCATdb_a_p_nullskiptables_V dumpxCATdb_p_V restorexCAT_h restorexCATdb_v -restorexCATdb_p restorexCATdb_p_V restorexCATdb_a_p_V restorexCATdb_wrongpath @@ -187,10 +166,6 @@ lsxcatd_null lsxcatd_h lsxcatd_d lsxcatd_a -xcatstart -xcatstop -xdcp_P -makedns_n_node makedns_d_node makedns_ubuntu_n copycds_iso @@ -249,6 +224,8 @@ rmkit_f rmkit_V rmkitcomp_v rmkitcomp_h +rmkitcomp_noscripts +rmkitcomp_f xdsh_h xdsh_V xdsh_regular_command @@ -260,3 +237,5 @@ xdsh_t xdsh_q xdsh_T xdsh_o +xdsh_c_sn +xdsh_i_linux From 76a14a07136e423008a679a10070479fa072d96a Mon Sep 17 00:00:00 2001 From: Junxiaw Date: Thu, 5 Feb 2015 06:45:53 -0800 Subject: [PATCH 2/2] modify bundlelist --- xCAT-test/autotest/bundle/p_rhels_cmd.bundle | 12 ------------ xCAT-test/autotest/bundle/p_sles_cmd.bundle | 12 ------------ xCAT-test/autotest/bundle/x_sles_cmd.bundle | 1 - 3 files changed, 25 deletions(-) diff --git a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle index ab32ff0b0..5b33d57f3 100644 --- a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle +++ b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle @@ -11,7 +11,6 @@ chdef_multiple_keys chdef_n chdef_t_o_error chtab_null -chtab_delete chtab_modify chtab_d chtab_modify_node @@ -31,7 +30,6 @@ packimage_h packimage_v pping_h pping_v -pping_all pping_node getmacs_noderange getmacs_d @@ -59,8 +57,6 @@ makedhcp_a makedhcp_a_d makedhcp_d mkdef_null -mkdef_t_o_attr -mkdef_f_t_o_attr mkdef_z mkdef_t_o_error nodeadd_noderange @@ -78,7 +74,6 @@ nodech_noderange_table_comma nodech_noderange_table_arrow nodech_noderanage_table_at nodech_delete -nodech_delete_error nodech_error_node nodech_error_table nodech_h @@ -136,7 +131,6 @@ rinv_firm rinv_all rinv_noderange_err rmdef_null -rmdef_t_o_attr rmdef_f_all rmdef_t_err rpower_off @@ -153,7 +147,6 @@ rscan_z rscan_w rscan_x_w rscan_z_w -mvitals_state rvitals_lcds rvitals_all rvitals_noderange_err @@ -222,12 +215,9 @@ makehosts_l makehosts_d makehosts_n makehosts_n_noderange -xcatstart -xcatstop xdcp_src_dst xdcp_P makedns_h -makedns_n_node makedns_d_node makedns_n makedns @@ -235,8 +225,6 @@ noderange_individual_node noderange_individual_grp noderange_node01-node10 noderange_node[01-10] -noderange_node[01 -noderange_f[1-2]n[1-3] noderange_group1-group3 noderange_node001-node200 noderange_node10+3 diff --git a/xCAT-test/autotest/bundle/p_sles_cmd.bundle b/xCAT-test/autotest/bundle/p_sles_cmd.bundle index ab32ff0b0..5b33d57f3 100644 --- a/xCAT-test/autotest/bundle/p_sles_cmd.bundle +++ b/xCAT-test/autotest/bundle/p_sles_cmd.bundle @@ -11,7 +11,6 @@ chdef_multiple_keys chdef_n chdef_t_o_error chtab_null -chtab_delete chtab_modify chtab_d chtab_modify_node @@ -31,7 +30,6 @@ packimage_h packimage_v pping_h pping_v -pping_all pping_node getmacs_noderange getmacs_d @@ -59,8 +57,6 @@ makedhcp_a makedhcp_a_d makedhcp_d mkdef_null -mkdef_t_o_attr -mkdef_f_t_o_attr mkdef_z mkdef_t_o_error nodeadd_noderange @@ -78,7 +74,6 @@ nodech_noderange_table_comma nodech_noderange_table_arrow nodech_noderanage_table_at nodech_delete -nodech_delete_error nodech_error_node nodech_error_table nodech_h @@ -136,7 +131,6 @@ rinv_firm rinv_all rinv_noderange_err rmdef_null -rmdef_t_o_attr rmdef_f_all rmdef_t_err rpower_off @@ -153,7 +147,6 @@ rscan_z rscan_w rscan_x_w rscan_z_w -mvitals_state rvitals_lcds rvitals_all rvitals_noderange_err @@ -222,12 +215,9 @@ makehosts_l makehosts_d makehosts_n makehosts_n_noderange -xcatstart -xcatstop xdcp_src_dst xdcp_P makedns_h -makedns_n_node makedns_d_node makedns_n makedns @@ -235,8 +225,6 @@ noderange_individual_node noderange_individual_grp noderange_node01-node10 noderange_node[01-10] -noderange_node[01 -noderange_f[1-2]n[1-3] noderange_group1-group3 noderange_node001-node200 noderange_node10+3 diff --git a/xCAT-test/autotest/bundle/x_sles_cmd.bundle b/xCAT-test/autotest/bundle/x_sles_cmd.bundle index fd1d4ff89..9c80eaa6d 100644 --- a/xCAT-test/autotest/bundle/x_sles_cmd.bundle +++ b/xCAT-test/autotest/bundle/x_sles_cmd.bundle @@ -170,7 +170,6 @@ lsxcatd_null lsxcatd_h lsxcatd_d lsxcatd_a -makedns_n_node makedns_d_node makedns_n makedns