From b86bb493e3683d1d28efbf4a181e2656662f453e Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Mon, 7 Nov 2016 03:29:59 -0500 Subject: [PATCH] completed --- xCAT-test/autotest/linux.conf.template | 2 ++ .../{ubuntule_migration1_p8le => ubuntu_migration1_p8le} | 4 ++-- .../migration/{ubuntux_migration1_vm => ubuntu_migration1_vm} | 4 ++-- .../{ubuntule_migration2_p8le => ubuntu_migration2_p8le} | 4 ++-- .../migration/{ubuntux_migration2_vm => ubuntu_migration2_vm} | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) rename xCAT-test/autotest/testcase/migration/{ubuntule_migration1_p8le => ubuntu_migration1_p8le} (95%) rename xCAT-test/autotest/testcase/migration/{ubuntux_migration1_vm => ubuntu_migration1_vm} (95%) rename xCAT-test/autotest/testcase/migration/{ubuntule_migration2_p8le => ubuntu_migration2_p8le} (95%) rename xCAT-test/autotest/testcase/migration/{ubuntux_migration2_vm => ubuntu_migration2_vm} (95%) diff --git a/xCAT-test/autotest/linux.conf.template b/xCAT-test/autotest/linux.conf.template index a6482e6a2..ecb158ad5 100644 --- a/xCAT-test/autotest/linux.conf.template +++ b/xCAT-test/autotest/linux.conf.template @@ -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 diff --git a/xCAT-test/autotest/testcase/migration/ubuntule_migration1_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le similarity index 95% rename from xCAT-test/autotest/testcase/migration/ubuntule_migration1_p8le rename to xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le index 5fbfce149..99fb91d37 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntule_migration1_p8le +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le @@ -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 diff --git a/xCAT-test/autotest/testcase/migration/ubuntux_migration1_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm similarity index 95% rename from xCAT-test/autotest/testcase/migration/ubuntux_migration1_vm rename to xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm index 38e3d3f09..dfdc34298 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntux_migration1_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm @@ -1,6 +1,6 @@ start:ubuntux_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 diff --git a/xCAT-test/autotest/testcase/migration/ubuntule_migration2_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le similarity index 95% rename from xCAT-test/autotest/testcase/migration/ubuntule_migration2_p8le rename to xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le index 83efb9b4f..dbcdbe258 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntule_migration2_p8le +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le @@ -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 diff --git a/xCAT-test/autotest/testcase/migration/ubuntux_migration2_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm similarity index 95% rename from xCAT-test/autotest/testcase/migration/ubuntux_migration2_vm rename to xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm index c17bdffb2..6f7ffde31 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntux_migration2_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm @@ -1,6 +1,6 @@ start:ubuntux_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