From 702fa8540dc9f45a8221225c18398d154a4aa878 Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Mon, 16 May 2016 23:00:59 -0400 Subject: [PATCH 1/2] update config and bundle files --- xCAT-test/autotest/bundle/p_rhels_cmd.bundle | 2 ++ xCAT-test/autotest/bundle/p_sles_cmd.bundle | 2 ++ xCAT-test/autotest/bundle/p_ubunut.cmd.bundle | 2 ++ xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle | 2 ++ xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle | 2 ++ xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle | 3 ++- xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle | 3 ++- xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle | 3 ++- xCAT-test/autotest/bundle/sles11.4_ppc64.bundle | 3 ++- xCAT-test/autotest/bundle/sles11.4_x86_64.bundle | 2 ++ xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle | 2 ++ xCAT-test/autotest/bundle/sles12.1_x86_64.bundle | 2 ++ xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle | 2 ++ xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle | 4 +++- xCAT-test/autotest/bundle/x_rhels_cmd.bundle | 2 ++ xCAT-test/autotest/bundle/x_sles_cmd.bundle | 2 ++ xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle | 2 ++ xCAT-test/autotest/linux.conf.template | 7 ++++++- 18 files changed, 41 insertions(+), 6 deletions(-) diff --git a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle index 61268c54a..02e1164b2 100644 --- a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle +++ b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle @@ -293,3 +293,5 @@ xcatd_restart run_command_with_XCATBYPASS disable_root_permission_in_policy_table assign_certain_command_permission +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/p_sles_cmd.bundle b/xCAT-test/autotest/bundle/p_sles_cmd.bundle index 89be4234d..00d550171 100644 --- a/xCAT-test/autotest/bundle/p_sles_cmd.bundle +++ b/xCAT-test/autotest/bundle/p_sles_cmd.bundle @@ -257,3 +257,5 @@ makentp_V makentp makentp_a nodeset_check_warninginfo +sles_migration1 +sles_migration2 diff --git a/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle b/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle index ca61c55ca..636262f28 100644 --- a/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle +++ b/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle @@ -197,3 +197,5 @@ copycds_iso copycds_n copycds_a copycds_n_a +ubuntu_migration1_p8le +ubuntu_migration2_p8le diff --git a/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle index 81ede5553..243184594 100644 --- a/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle @@ -301,3 +301,5 @@ reg_linux_diskfull_installation_hierarchy reg_linux_diskless_installation_hierarchy reg_linux_statelite_installation_hierarchy_by_ramdisk reg_linux_statelite_installation_hierarchy_by_nfs +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle index cec465f07..2e7b87490 100644 --- a/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle @@ -204,3 +204,5 @@ reg_linux_diskfull_installation_hierarchy reg_linux_diskless_installation_hierarchy reg_linux_statelite_installation_hierarchy_by_ramdisk reg_linux_statelite_installation_hierarchy_by_nfs +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle index 83ee07f1b..243184594 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle @@ -301,4 +301,5 @@ reg_linux_diskfull_installation_hierarchy reg_linux_diskless_installation_hierarchy reg_linux_statelite_installation_hierarchy_by_ramdisk reg_linux_statelite_installation_hierarchy_by_nfs - +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle index 6d09a6332..401756957 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle @@ -192,4 +192,5 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V - +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle index 3a5e399db..2e7b87490 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle @@ -204,4 +204,5 @@ reg_linux_diskfull_installation_hierarchy reg_linux_diskless_installation_hierarchy reg_linux_statelite_installation_hierarchy_by_ramdisk reg_linux_statelite_installation_hierarchy_by_nfs - +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle index 97abf0e0f..b46de71a3 100644 --- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle +++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle @@ -265,4 +265,5 @@ reg_linux_diskfull_installation_hierarchy reg_linux_diskless_installation_hierarchy reg_linux_statelite_installation_hierarchy_by_ramdisk reg_linux_statelite_installation_hierarchy_by_nfs - +sles_migration1 +sles_migration2 diff --git a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle index c052f115a..8fd6db580 100644 --- a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle @@ -214,3 +214,5 @@ reg_linux_diskfull_installation_hierarchy reg_linux_diskless_installation_hierarchy reg_linux_statelite_installation_hierarchy_by_ramdisk reg_linux_statelite_installation_hierarchy_by_nfs +sles_migration1 +sles_migration2 diff --git a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle index d22c28ba2..a3716f22c 100644 --- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle @@ -196,3 +196,5 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +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 a5da4cee6..0225c9d50 100644 --- a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle @@ -209,3 +209,5 @@ disable_root_permission_in_policy_table assign_certain_command_permission reg_linux_diskless_installation_flat reg_linux_statelite_installation_flat +sles_migration1 +sles_migration2 diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle index de643cfcc..43e2804ee 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle @@ -240,3 +240,5 @@ xcatd_restart run_command_with_XCATBYPASS disable_root_permission_in_policy_table assign_certain_command_permission +ubuntu_migration1_p8le +ubuntu_migration2_p8le diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle index eeab10ae7..e7ffd6bb9 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle @@ -256,4 +256,6 @@ rmdocker_h rmdocker_command rmdocker_f_command lsdocker_h_command -lsdocker_l_command \ No newline at end of file +lsdocker_l_command +ubuntux_migration1_vm +ubuntux_migration2_vm diff --git a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle index 3291a01cd..aac12e801 100644 --- a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle +++ b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle @@ -196,3 +196,5 @@ switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V nodeset_check_warninginfo +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/x_sles_cmd.bundle b/xCAT-test/autotest/bundle/x_sles_cmd.bundle index 00c966d83..fe978e117 100644 --- a/xCAT-test/autotest/bundle/x_sles_cmd.bundle +++ b/xCAT-test/autotest/bundle/x_sles_cmd.bundle @@ -206,3 +206,5 @@ xcatd_restart run_command_with_XCATBYPASS disable_root_permission_in_policy_table assign_certain_command_permission +sles_migration1 +sles_migration2 diff --git a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle index 4b67d0bc1..11ea27fae 100644 --- a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle +++ b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle @@ -254,3 +254,5 @@ rmdocker_command rmdocker_f_command lsdocker_h_command lsdocker_l_command +ubuntux_migration1_vm +ubuntux_migration2_vm diff --git a/xCAT-test/autotest/linux.conf.template b/xCAT-test/autotest/linux.conf.template index 8f167c41f..2e7c9e52f 100644 --- a/xCAT-test/autotest/linux.conf.template +++ b/xCAT-test/autotest/linux.conf.template @@ -67,6 +67,11 @@ NETDRIVER=ibmveth #network infterface card driver used by diskless installat NETBOOTDIR=/opt/xcat/share/xcat/netboot/rh #path of netboot directory, used by diskless installation MaxLparID=32 KITDATA=kitdata +#For migration cases Begin +UBUNTU_MIGRATION1_CORE=https://xcat.org/files/xcat/xcat-core/2.10.x_Ubuntu/xcat-core/xcat-core-2.10.tar.bz2 +UBUNTU_MIGRATION2_CORE=https://xcat.org/files/xcat/xcat-core/2.11.x_Ubuntu/xcat-core/xcat-core-2.11.1-ubuntu.tar.bz2 +UBUNTU_MIGRATION1_DEP=https://xcat.org/files/xcat/xcat-dep/2.x_Ubuntu/xcat-dep-ubuntu-20151012.tar.bz +UBUNTU_MIGRATION2_DEP=https://xcat.org/files/xcat/xcat-dep/2.x_Ubuntu/xcat-dep-ubuntu-2.11.1.tar.bz2 MIGRATION1_CORE=http://xcat.org/files/xcat/xcat-core/2.10.x_Linux/xcat-core/xcat-core-2.10.tar.bz2 MIGRATION2_CORE=http://xcat.org/files/xcat/xcat-core/2.11.x_Linux/xcat-core/xcat-core-2.11.1-linux.tar.bz2 MIGRATION1_DEP=http://xcat.org/files/xcat/xcat-dep/2.x_Linux/xcat-dep-2.10.tar.bz2 @@ -74,7 +79,7 @@ MIGRATION2_DEP=http://xcat.org/files/xcat/xcat-dep/2.x_Linux/xcat-dep-2.11.1.tar MIGRATION1_VERSION=2.10 MIGRATION2_VERSION=2.11.1 LATEST_VERSION=2.12 - +#For migration cass End [Custom] #commands run before test From 01492531afdbcb35dfffe31b356ae15cf609e025 Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Mon, 16 May 2016 23:05:15 -0400 Subject: [PATCH 2/2] add le bundle files --- xCAT-test/autotest/bundle/le_rhels_cmd.bundle | 2 ++ xCAT-test/autotest/bundle/le_sles_cmd.bundle | 2 ++ xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle | 2 ++ xCAT-test/autotest/bundle/p_ubunut.cmd.bundle | 2 -- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/bundle/le_rhels_cmd.bundle b/xCAT-test/autotest/bundle/le_rhels_cmd.bundle index 91def4d65..742b6066c 100644 --- a/xCAT-test/autotest/bundle/le_rhels_cmd.bundle +++ b/xCAT-test/autotest/bundle/le_rhels_cmd.bundle @@ -190,3 +190,5 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +redhat_migration1 +redhat_migration2 diff --git a/xCAT-test/autotest/bundle/le_sles_cmd.bundle b/xCAT-test/autotest/bundle/le_sles_cmd.bundle index a840d726e..ee0f0e23e 100644 --- a/xCAT-test/autotest/bundle/le_sles_cmd.bundle +++ b/xCAT-test/autotest/bundle/le_sles_cmd.bundle @@ -194,3 +194,5 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +sles_migration1 +sles_migration2 diff --git a/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle b/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle index 5c1428c70..452f1e480 100644 --- a/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle +++ b/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle @@ -238,3 +238,5 @@ xcatd_restart run_command_with_XCATBYPASS disable_root_permission_in_policy_table assign_certain_command_permission +ubuntu_migration1_p8le +ubuntu_migration2_p8le diff --git a/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle b/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle index 636262f28..ca61c55ca 100644 --- a/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle +++ b/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle @@ -197,5 +197,3 @@ copycds_iso copycds_n copycds_a copycds_n_a -ubuntu_migration1_p8le -ubuntu_migration2_p8le