From 3c6fc950567e1b793f19e866fa0efd84ac937a9b Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Wed, 30 Nov 2016 03:50:54 -0500 Subject: [PATCH 1/2] complete --- xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm | 4 ++-- xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm index 996bc7d99..9d76147bb 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm @@ -71,7 +71,7 @@ cmd:xdsh $$CN "apt-get clean all" check:rc==0 cmd:xdsh $$CN "apt-get update" check:rc==0 -cmd:xdsh $$CN "apt-get -y install xcat xCAT-test" +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 @@ -103,7 +103,7 @@ cmd:xdsh $$CN "apt-get clean all" check:rc==0 cmd:xdsh $$CN "apt-get update" check:rc==0 -cmd:xdsh $$CN "apt-get -y upgrade xcat xCAT-test" +cmd:xdsh $$CN "apt-get -y upgrade xcat xcat-test" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /newxcat/new_version" check:rc==0 diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm index 6a0bbe636..139391885 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm @@ -71,7 +71,7 @@ cmd:xdsh $$CN "apt-get clean all" check:rc==0 cmd:xdsh $$CN "apt-get update" check:rc==0 -cmd:xdsh $$CN "apt-get -y install xcat xCAT-test" +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 @@ -103,7 +103,7 @@ cmd:xdsh $$CN "apt-get clean all" check:rc==0 cmd:xdsh $$CN "apt-get update" check:rc==0 -cmd:xdsh $$CN "apt-get -y upgrade xcat xCAT-test" +cmd:xdsh $$CN "apt-get -y upgrade xcat xcat-test" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v > /newxcat/new_version" check:rc==0 From bc112393c16cac610798bdf5f3a9ffaa11f31481 Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Tue, 6 Dec 2016 01:35:53 -0500 Subject: [PATCH 2/2] complete --- xCAT-test/autotest/testcase/buildkit/cases0 | 2 -- 1 file changed, 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/buildkit/cases0 b/xCAT-test/autotest/testcase/buildkit/cases0 index 17149110d..fd8fd2774 100644 --- a/xCAT-test/autotest/testcase/buildkit/cases0 +++ b/xCAT-test/autotest/testcase/buildkit/cases0 @@ -103,7 +103,6 @@ cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit;buildkit create pro check:rc==0 cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit;buildkit buildrepo all check:rc==0 -check:output!~error cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir check:output=~prodkit-1.0-1 cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir/prodkit-1.0-1-* @@ -154,7 +153,6 @@ cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit;buildkit create pro check:rc==0 cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit;reponame=`cat buildkit.conf|grep kitrepoid|sed 's/ //g' |grep ^kitrepoid=|head -1|awk -F= '{print $2}'`;buildkit buildrepo $reponame check:rc==0 -check:output!~error cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir check:output=~prodkit-1.0-1 cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir/prodkit-1.0-1-*