From 037de89bd0f71abd8774f4c23f5340509b4bc91c Mon Sep 17 00:00:00 2001 From: huweihua Date: Wed, 4 Jul 2018 02:30:37 -0400 Subject: [PATCH 1/2] Sync up bundle list after combining xcatd test cases --- xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle | 12 ++++++------ xCAT-test/autotest/bundle/sles12.2_x86_64.bundle | 12 ++++++------ .../autotest/bundle/ubuntu16.04.1_ppc64le.bundle | 12 ++++++------ .../autotest/bundle/ubuntu16.04.1_x86_64.bundle | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle index 8d500bc10..96783dcb4 100644 --- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle @@ -227,12 +227,12 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +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 xcatconfig_c bmcdiscover_help diff --git a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle index 0b7a4d19a..17d4379c4 100644 --- a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle @@ -225,12 +225,12 @@ switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V nodeset_check_warninginfo -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +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 xcatconfig_c bmcdiscover_help diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle index 59b57f4ae..e48e451f9 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle @@ -258,12 +258,12 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +xcatd_start +xcatd_stop +xcatd_restart +run_command_with_XCATBYPASS +disable_root_permission_in_policy_table +assign_certain_command_permission xcatconfig_u_check_xcatsslversion_ubuntu xcatconfig_c bmcdiscover_help 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 9cb6f996c..14e69dc79 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle @@ -262,12 +262,12 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +xcatd_start +xcatd_stop +xcatd_restart +run_command_with_XCATBYPASS +disable_root_permission_in_policy_table +assign_certain_command_permission nodeset_check_warninginfo xcatconfig_u_check_xcatsslversion_ubuntu xcatconfig_c From ca5cc198b3008659034174e2c0577fb0f230956e Mon Sep 17 00:00:00 2001 From: huweihua Date: Wed, 4 Jul 2018 03:40:44 -0400 Subject: [PATCH 2/2] sync up older files at same time --- xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle | 12 ++++++------ xCAT-test/autotest/bundle/sles12.1_x86_64.bundle | 12 ++++++------ xCAT-test/autotest/bundle/sles12_ppc64le.bundle | 12 ++++++------ xCAT-test/autotest/bundle/sles12_x86_64.bundle | 12 ++++++------ xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle | 12 ++++++------ xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle index 34517a629..909d022ac 100644 --- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle @@ -215,12 +215,12 @@ switchdiscover_range_z_V nodeset_shell nodeset_cmdline nodeset_runimg -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +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 sles_migration1 sles_migration2 diff --git a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle index 8d738fa2e..732813702 100644 --- a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle @@ -212,12 +212,12 @@ nodeset_shell nodeset_cmdline nodeset_runimg nodeset_check_warninginfo -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +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 sles_migration1 sles_migration2 diff --git a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle index 4189d2a14..90f286d24 100644 --- a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle @@ -198,12 +198,12 @@ switchdiscover_range_z_V nodeset_shell nodeset_cmdline nodeset_runimg -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +xcatd_start +xcatd_stop +xcatd_restart +run_command_with_XCATBYPASS +disable_root_permission_in_policy_table +assign_certain_command_permission sles_migration1 sles_migration2 reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/sles12_x86_64.bundle b/xCAT-test/autotest/bundle/sles12_x86_64.bundle index 91afe00d7..43c40e086 100644 --- a/xCAT-test/autotest/bundle/sles12_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12_x86_64.bundle @@ -203,12 +203,12 @@ nodeset_shell nodeset_cmdline nodeset_runimg nodeset_check_warninginfo -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +xcatd_start +xcatd_stop +xcatd_restart +run_command_with_XCATBYPASS +disable_root_permission_in_policy_table +assign_certain_command_permission reg_linux_diskless_installation_flat reg_linux_statelite_installation_flat SN_setup_case diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle index fe8341451..5d8b1e49f 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle @@ -233,12 +233,12 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +xcatd_start +xcatd_stop +xcatd_restart +run_command_with_XCATBYPASS +disable_root_permission_in_policy_table +assign_certain_command_permission nodeset_shell nodeset_cmdline nodeset_runimg diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle index 3f79a8fc5..10eeb89e6 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle @@ -243,10 +243,10 @@ switchdiscover_range_z_V nodeset_shell nodeset_cmdline nodeset_runimg -xcatd_start_systemd -xcatd_stop_systemd -xcatd_restart_systemd -run_command_with_XCATBYPASS_systemd -disable_root_permission_in_policy_table_systemd -assign_certain_command_permission_systemd +xcatd_start +xcatd_stop +xcatd_restart +run_command_with_XCATBYPASS +disable_root_permission_in_policy_table +assign_certain_command_permission nodeset_check_warninginfo