xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1124 from caomengmeng/update_bundle_files_for_migration_cases

Browse Source 
Update config and bundle files for migration cases
This commit is contained in:
tingtli 2016-05-17 13:38:32 +08:00
commit b3b04a4eb1
20 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-test/autotest/bundle/le_rhels_cmd.bundle
View File

@ -190,3 +190,5 @@ switchdiscover_range_r
switchdiscover_range_x
switchdiscover_range_z
switchdiscover_range_z_V
redhat_migration1
redhat_migration2

2
xCAT-test/autotest/bundle/le_sles_cmd.bundle
View File

@ -194,3 +194,5 @@ switchdiscover_range_r
switchdiscover_range_x
switchdiscover_range_z
switchdiscover_range_z_V
sles_migration1
sles_migration2

2
xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle
View File

@ -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

2
xCAT-test/autotest/bundle/p_rhels_cmd.bundle
View File

@ -293,3 +293,5 @@ xcatd_restart
run_command_with_XCATBYPASS
disable_root_permission_in_policy_table
assign_certain_command_permission
redhat_migration1
redhat_migration2

2
xCAT-test/autotest/bundle/p_sles_cmd.bundle
View File

@ -257,3 +257,5 @@ makentp_V
makentp
makentp_a
nodeset_check_warninginfo
sles_migration1
sles_migration2

2
xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
View File

@ -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

2
xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle
View File

@ -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

3
xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
View File

@ -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

3
xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
View File

@ -192,4 +192,5 @@ switchdiscover_range_r
switchdiscover_range_x
switchdiscover_range_z
switchdiscover_range_z_V
redhat_migration1
redhat_migration2

3
xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle
View File

@ -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

3
xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
View File

@ -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

2
xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
View File

@ -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

2
xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
View File

@ -196,3 +196,5 @@ switchdiscover_range_r
switchdiscover_range_x
switchdiscover_range_z
switchdiscover_range_z_V
sles_migration1
sles_migration2

2
xCAT-test/autotest/bundle/sles12.1_x86_64.bundle
View File

@ -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

2
xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
View File

@ -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

4
xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
View File

@ -256,4 +256,6 @@ rmdocker_h
rmdocker_command
rmdocker_f_command
lsdocker_h_command
lsdocker_l_command
lsdocker_l_command
ubuntux_migration1_vm
ubuntux_migration2_vm

2
xCAT-test/autotest/bundle/x_rhels_cmd.bundle
View File

@ -196,3 +196,5 @@ switchdiscover_range_x
switchdiscover_range_z
switchdiscover_range_z_V
nodeset_check_warninginfo
redhat_migration1
redhat_migration2

2
xCAT-test/autotest/bundle/x_sles_cmd.bundle
View File

@ -206,3 +206,5 @@ xcatd_restart
run_command_with_XCATBYPASS
disable_root_permission_in_policy_table
assign_certain_command_permission
sles_migration1
sles_migration2

2
xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
View File

@ -254,3 +254,5 @@ rmdocker_command
rmdocker_f_command
lsdocker_h_command
lsdocker_l_command
ubuntux_migration1_vm
ubuntux_migration2_vm

7
xCAT-test/autotest/linux.conf.template
View File

@ -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