From 4e2dd72e06220bc6b4b033f02f18c02d0d00043f Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Sun, 16 Jul 2017 22:29:08 -0400 Subject: [PATCH 1/3] remove confignetworks cases since daily regression environment does not support the cases --- xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle | 8 -------- xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle | 8 -------- 2 files changed, 16 deletions(-) diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle index 2f56db766..361b75b9d 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle @@ -6,17 +6,9 @@ makehosts_help makehosts_n_noderange makehosts_n makehost_n_r -confignetwork_s_installnic_secondarynic_updatenode -confignetwork_secondarynic_updatenode -confignetwork_secondarynic_nicaliases_updatenode -confignetwork_secondarynic_nicextraparams_updatenode confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false confignetwork_secondarynic_nictype_updatenode_false -confignetwork_disable_set_to_yes -confignetwork_disable_set_to_1 -confignetwork_niccustomscripts -confignetwork_secondarynic_thirdnic_multiplevalue_updatenode chdef_null chdef_z chdef_t_o_error diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle index 178c2ee8b..b56746f85 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle @@ -7,17 +7,9 @@ makehosts_help makehosts_n_noderange makehosts_n makehost_n_r -confignetwork_s_installnic_secondarynic_updatenode -confignetwork_secondarynic_updatenode -confignetwork_secondarynic_nicaliases_updatenode -confignetwork_secondarynic_nicextraparams_updatenode confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false confignetwork_secondarynic_nictype_updatenode_false -confignetwork_disable_set_to_yes -confignetwork_disable_set_to_1 -confignetwork_niccustomscripts -confignetwork_secondarynic_thirdnic_multiplevalue_updatenode chdef_null chdef_z chdef_t_o_error From 1bc1650c82a2f6220d0ba5594bdb8cecc9b42635 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Mon, 17 Jul 2017 04:37:08 -0400 Subject: [PATCH 2/3] update bundle --- xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle | 8 -------- xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle | 8 -------- 2 files changed, 16 deletions(-) diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle index b4b24da9c..8ea26b428 100644 --- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle @@ -20,17 +20,9 @@ updatenode_diskful_syncfiles_P_script1 updatenode_script3 updatenode_P_script1_script2 updatenode_without_flag -confignetwork_s_installnic_secondarynic_updatenode -confignetwork_secondarynic_updatenode -confignetwork_secondarynic_nicaliases_updatenode -confignetwork_secondarynic_nicextraparams_updatenode confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false confignetwork_secondarynic_nictype_updatenode_false -confignetwork_disable_set_to_yes -confignetwork_disable_set_to_1 -confignetwork_niccustomscripts -confignetwork_secondarynic_thirdnic_multiplevalue_updatenode chdef_null chdef_t_node chdef_t_network diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle index cda0ea4f2..e315bf198 100644 --- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle @@ -6,17 +6,9 @@ makehosts_help makehosts_n makehosts_n_noderange makehost_n_r -confignetwork_s_installnic_secondarynic_updatenode -confignetwork_secondarynic_updatenode -confignetwork_secondarynic_nicaliases_updatenode -confignetwork_secondarynic_nicextraparams_updatenode confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false confignetwork_secondarynic_nictype_updatenode_false -confignetwork_disable_set_to_yes -confignetwork_disable_set_to_1 -confignetwork_niccustomscripts -confignetwork_secondarynic_thirdnic_multiplevalue_updatenode chdef_null chdef_z chdef_t_o_error From f68d2630d44cc9b045fa160254cbf5cc2dc1abf5 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Mon, 17 Jul 2017 04:45:25 -0400 Subject: [PATCH 3/3] update bundle --- xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle | 8 -------- xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle | 8 -------- xCAT-test/autotest/bundle/sles11.4_ppc64.bundle | 8 -------- 3 files changed, 24 deletions(-) diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle index c790b2146..ff947230c 100644 --- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle @@ -17,17 +17,9 @@ updatenode_diskful_syncfiles_P_script1 updatenode_script3 updatenode_P_script1_script2 updatenode_without_flag -confignetwork_s_installnic_secondarynic_updatenode -confignetwork_secondarynic_updatenode -confignetwork_secondarynic_nicaliases_updatenode -confignetwork_secondarynic_nicextraparams_updatenode confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false confignetwork_secondarynic_nictype_updatenode_false -confignetwork_disable_set_to_yes -confignetwork_disable_set_to_1 -confignetwork_niccustomscripts -confignetwork_secondarynic_thirdnic_multiplevalue_updatenode chdef_null chdef_t_node chdef_t_network diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle index b61c79e07..c0f227acf 100644 --- a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle @@ -17,17 +17,9 @@ updatenode_diskful_syncfiles_P_script1 updatenode_script3 updatenode_P_script1_script2 updatenode_without_flag -confignetwork_s_installnic_secondarynic_updatenode -confignetwork_secondarynic_updatenode -confignetwork_secondarynic_nicaliases_updatenode -confignetwork_secondarynic_nicextraparams_updatenode confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false confignetwork_secondarynic_nictype_updatenode_false -confignetwork_disable_set_to_yes -confignetwork_disable_set_to_1 -confignetwork_niccustomscripts -confignetwork_secondarynic_thirdnic_multiplevalue_updatenode chdef_null chdef_t_node chdef_t_network diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle index ecc350e90..b214d526f 100644 --- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle +++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle @@ -231,17 +231,9 @@ confignics_config_multiple_port_withnichostnamesuffixes_multiple_value confignics_config_multiple_port_withnicaliases_multiple_value confignics_disable_set_to_yes confignics_disable_set_to_1 -confignetwork_s_installnic_secondarynic_updatenode -confignetwork_secondarynic_updatenode -confignetwork_secondarynic_nicaliases_updatenode -confignetwork_secondarynic_nicextraparams_updatenode confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false confignetwork_secondarynic_nictype_updatenode_false -confignetwork_disable_set_to_yes -confignetwork_disable_set_to_1 -confignetwork_niccustomscripts -confignetwork_secondarynic_thirdnic_multiplevalue_updatenode xdsh_h xdsh_V xdsh_regular_command