From 0e0584e4239599a077ef5d670cf95a9ef225249e Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Sat, 24 Mar 2018 12:00:21 -0400 Subject: [PATCH 1/2] Fix bugs of go-xcat test cases,Modify go-xcat test cases #21 --- xCAT-test/autotest/testcase/go-xcat/case1 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xCAT-test/autotest/testcase/go-xcat/case1 b/xCAT-test/autotest/testcase/go-xcat/case1 index 00d9381a1..bb936f73a 100644 --- a/xCAT-test/autotest/testcase/go-xcat/case1 +++ b/xCAT-test/autotest/testcase/go-xcat/case1 @@ -50,11 +50,10 @@ check:rc==0 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi check:rc==0 cmd:rm -rf /tmp/go-xcat.log -cmd:xdsh $$CN "cd /; ./go-xcat -x $$MIGRATION2_VERSION -y install" +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`; xdsh $$CN "cd /; ./go-xcat -x $migration_version -y install" check:rc==0 cmd:cat /tmp/go-xcat.log cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" -check:output=~Version $$MIGRATION2_VERSION cmd:xdsh $$CN "service xcatd status" check:rc==0 check:output=~running @@ -118,12 +117,11 @@ check:rc==0 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi check:rc==0 cmd:rm -rf /tmp/go-xcat.log -cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=$$MIGRATION2_VERSION -y install" +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`; xdsh $$CN "cd /; ./go-xcat --xcat-version=$migration_version -y install" check:rc==0 cmd:cat /tmp/go-xcat.log cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" check:rc==0 -check:output=~Version $$MIGRATION2_VERSION cmd:xdsh $$CN "service xcatd status" check:rc==0 check:output=~running @@ -134,4 +132,3 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";els check:rc!=0 cmd:xdsh $$CN "cd /; rm -rf /go-xcat" end - From 5aa24911f46570b16e4ecfa40e533afdcf89c9d6 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Mon, 26 Mar 2018 22:09:18 -0400 Subject: [PATCH 2/2] add information to check the version --- xCAT-test/autotest/testcase/go-xcat/case1 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/xCAT-test/autotest/testcase/go-xcat/case1 b/xCAT-test/autotest/testcase/go-xcat/case1 index bb936f73a..24db15efc 100644 --- a/xCAT-test/autotest/testcase/go-xcat/case1 +++ b/xCAT-test/autotest/testcase/go-xcat/case1 @@ -54,6 +54,13 @@ cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`; xdsh $$CN " check:rc==0 cmd:cat /tmp/go-xcat.log cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" +check:rc==0 +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`;cd /;if grep Ubuntu /etc/*release;then cd / ; wget http://xcat.org/files/xcat/repos/apt/$migration_version/xcat-core/buildinfo;else cd / ; wget http://xcat.org/files/xcat/repos/yum/$migration_version/xcat-core/buildinfo; fi +cmd:xdsh $$CN "lsxcatd -v" |tee /tmp/version +cmd:if [ -e /buildinfo ]; then xcatversion=`grep VERSION /buildinfo |awk -F'=' '{print $2}'`;grep $xcatversion /tmp/version; fi +check:rc==0 +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`;grep $migration_version /tmp/version +check:rc==0 cmd:xdsh $$CN "service xcatd status" check:rc==0 check:output=~running @@ -63,6 +70,8 @@ check:rc==0 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa|grep -i perl-xcat";fi check:rc!=0 cmd:xdsh $$CN "cd /; rm -rf /go-xcat" +cmd:rm -rf /tmp/version +cmd:rm -rf /buildinfo end start:go_xcat_with_xcat-version-1 @@ -122,6 +131,12 @@ check:rc==0 cmd:cat /tmp/go-xcat.log cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" check:rc==0 +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`;cd /;if grep Ubuntu /etc/*release;then cd / ; wget http://xcat.org/files/xcat/repos/apt/$migration_version/xcat-core/buildinfo;else cd / ; wget http://xcat.org/files/xcat/repos/yum/$migration_version/xcat-core/buildinfo; fi +cmd:xdsh $$CN "lsxcatd -v" |tee /tmp/version +cmd:if [ -e /buildinfo ]; then xcatversion=`grep VERSION /buildinfo |awk -F'=' '{print $2}'`;grep $xcatversion /tmp/version; fi +check:rc==0 +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`;grep $migration_version /tmp/version +check:rc==0 cmd:xdsh $$CN "service xcatd status" check:rc==0 check:output=~running @@ -131,4 +146,6 @@ check:rc==0 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa|grep -i perl-xcat";fi check:rc!=0 cmd:xdsh $$CN "cd /; rm -rf /go-xcat" +cmd:rm -rf /tmp/version +cmd:rm -rf /buildinfo end