xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-22 05:55:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2096 from caomengmeng/update_ubuntu_migration

Browse Source 
This is for ubuntu migration. I agree to merge
This commit is contained in:
tingtli
2016-11-08 11:03:06 +08:00
committed by GitHub
parent 1cd4b6446c 9c341f9bdd
commit 0c49aa43c8
10 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,5 +257,5 @@ rmdocker_command
rmdocker_f_command
lsdocker_h_command
lsdocker_l_command
ubuntux_migration1_vm
ubuntux_migration2_vm
ubuntu_migration1_vm
ubuntu_migration2_vm

4
xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
View File

@ -253,5 +253,5 @@ run_command_with_XCATBYPASS
disable_root_permission_in_policy_table
assign_certain_command_permission
xcatconfig_u_check_xcatsslversion_ubuntu
ubuntule_migration1_p8le
ubuntule_migration2_p8le
ubuntu_migration1_p8le
ubuntu_migration2_p8le

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

@ -270,5 +270,5 @@ rmdocker_f_command
lsdocker_h_command
lsdocker_l_command
xcatconfig_u_check_xcatsslversion_ubuntu
ubuntux_migration1_vm
ubuntux_migration2_vm
ubuntu_migration1_vm
ubuntu_migration2_vm

4
xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
View File

@ -253,6 +253,6 @@ run_command_with_XCATBYPASS_systemd
disable_root_permission_in_policy_table_systemd
assign_certain_command_permission_systemd
xcatconfig_u_check_xcatsslversion_ubuntu
ubuntule_migration1_p8le
ubuntule_migration2_p8le
ubuntu_migration1_p8le
ubuntu_migration2_p8le

4
xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
View File

@ -262,5 +262,5 @@ disable_root_permission_in_policy_table_systemd
assign_certain_command_permission_systemd
nodeset_check_warninginfo
xcatconfig_u_check_xcatsslversion_ubuntu
ubuntux_migration1_vm
ubuntux_migration2_vm
ubuntu_migration1_vm
ubuntu_migration2_vm

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

@ -72,6 +72,8 @@ UBUNTU_MIGRATION1_CORE=https://xcat.org/files/xcat/xcat-core/2.10.x_Ubuntu/xcat-
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
UBUNTU_MIGRATION1_VERSION=2.10
UBUNTU_MIGRATION2_VERSION=2.11.1
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

4
xCAT-test/autotest/testcase/migration/ubuntule_migration1_p8le → xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le
View File

@ -1,6 +1,6 @@
start:ubuntu_migration1_p8le
os:Linux
description:update xCAT from $$MIGRATION1_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
description:update xCAT from $$UBUNTU_MIGRATION1_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
cmd:copycds $$ISO
check:rc==0
@ -76,7 +76,7 @@ cmd:xdsh $$CN "apt-get -y install xcat xCAT-test"
check:rc==0
cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /oldxcat/old_version"
check:rc==0
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$MIGRATION1_VERSION"
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$UBUNTU_MIGRATION1_VERSION"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0

6
xCAT-test/autotest/testcase/migration/ubuntux_migration1_vm → xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm
View File

@ -1,6 +1,6 @@
start:ubuntux_migration1_vm
start:ubuntu_migration1_vm
os:Linux
description:update xCAT from $$MIGRATION1_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
description:update xCAT from $$UBUNTU_MIGRATION1_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
cmd:copycds $$ISO
check:rc==0
@ -75,7 +75,7 @@ cmd:xdsh $$CN "apt-get -y install xcat xCAT-test"
check:rc==0
cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /oldxcat/old_version"
check:rc==0
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$MIGRATION1_VERSION"
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$UBUNTU_MIGRATION1_VERSION"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0

4
xCAT-test/autotest/testcase/migration/ubuntule_migration2_p8le → xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le
View File

@ -1,6 +1,6 @@
start:ubuntu_migration2_p8le
os:Linux
description:update xCAT from $$MIGRATION2_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
description:update xCAT from $$UBUNTU_MIGRATION2_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
cmd:copycds $$ISO
check:rc==0
@ -76,7 +76,7 @@ cmd:xdsh $$CN "apt-get -y install xcat xCAT-test"
check:rc==0
cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /oldxcat/old_version"
check:rc==0
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$MIGRATION2_VERSION"
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$UBUNTU_MIGRATION2_VERSION"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0

6
xCAT-test/autotest/testcase/migration/ubuntux_migration2_vm → xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm
View File

@ -1,6 +1,6 @@
start:ubuntux_migration2_vm
start:ubuntu_migration2_vm
os:Linux
description:update xCAT from $$MIGRATION2_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
description:update xCAT from $$UBUNTU_MIGRATION2_VERSION to $$LATEST_VERSION, these two global parameter defined in config file
cmd:copycds $$ISO
check:rc==0
@ -75,7 +75,7 @@ cmd:xdsh $$CN "apt-get -y install xcat xCAT-test"
check:rc==0
cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /oldxcat/old_version"
check:rc==0
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$MIGRATION2_VERSION"
cmd:xdsh $$CN "cat /oldxcat/old_version|grep $$UBUNTU_MIGRATION2_VERSION"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0