From 996f101489d22fd457ac4186b587934d1cc03314 Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Tue, 17 Jan 2017 02:40:27 -0500 Subject: [PATCH] completed --- .../autotest/testcase/migration/ubuntu_migration1_p8le | 6 ++++-- xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm | 6 ++++-- .../autotest/testcase/migration/ubuntu_migration2_p8le | 6 ++++-- xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le index 02d5d9d36..8ecc98262 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_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 $$UBUNTU_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 @@ -108,7 +108,9 @@ cmd:xdsh $$CN "apt-get -y --only-upgrade install .*xcat.*" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /newxcat/new_version" check:rc==0 -cmd:xdsh $$CN "cat /newxcat/new_version|grep $$LATEST_VERSION" +cmd:lsxcatd -v > /latest_version_info;scp /latest_version_info root@$$CN:/newxcat/ +check:rc==0 +cmd:xdsh $$CN diff /newxcat/latest_version_info /newxcat/new_version check:rc==0 cmd:xdsh $$CN "service xcatd status" check:rc==0 diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm index 3c4e3aadc..ff7d72fdd 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm @@ -1,6 +1,6 @@ start:ubuntu_migration1_vm os:Linux -description:update xCAT from $$UBUNTU_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 @@ -107,7 +107,9 @@ cmd:xdsh $$CN "apt-get -y --only-upgrade install .*xcat.*" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /newxcat/new_version" check:rc==0 -cmd:xdsh $$CN "cat /newxcat/new_version|grep $$LATEST_VERSION" +cmd:lsxcatd -v > /latest_version_info;scp /latest_version_info root@$$CN:/newxcat/ +check:rc==0 +cmd:xdsh $$CN diff /newxcat/latest_version_info /newxcat/new_version check:rc==0 cmd:xdsh $$CN "service xcatd status" check:rc==0 diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le index 810adb134..5cb240c89 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_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 $$UBUNTU_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 @@ -108,7 +108,9 @@ cmd:xdsh $$CN "apt-get -y --only-upgrade install .*xcat.*" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /newxcat/new_version" check:rc==0 -cmd:xdsh $$CN "cat /newxcat/new_version|grep $$LATEST_VERSION" +cmd:lsxcatd -v > /latest_version_info;scp /latest_version_info root@$$CN:/newxcat/ +check:rc==0 +cmd:xdsh $$CN diff /newxcat/latest_version_info /newxcat/new_version check:rc==0 cmd:xdsh $$CN "service xcatd status" check:rc==0 diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm index 866073f27..70dc86d76 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm @@ -1,6 +1,6 @@ start:ubuntu_migration2_vm os:Linux -description:update xCAT from $$UBUNTU_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 @@ -107,7 +107,9 @@ cmd:xdsh $$CN "apt-get -y --only-upgrade install .*xcat.*" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /newxcat/new_version" check:rc==0 -cmd:xdsh $$CN "cat /newxcat/new_version|grep $$LATEST_VERSION" +cmd:lsxcatd -v > /latest_version_info;scp /latest_version_info root@$$CN:/newxcat/ +check:rc==0 +cmd:xdsh $$CN diff /newxcat/latest_version_info /newxcat/new_version check:rc==0 cmd:xdsh $$CN "service xcatd status" check:rc==0