From 57b10b57bd859b18cf3d0adc16005b31eaf7c15c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 1 Jun 2017 14:27:45 +0800 Subject: [PATCH] Add basic integration check to all the migration tests --- xCAT-test/autotest/testcase/migration/redhat_migration | 4 ++++ xCAT-test/autotest/testcase/migration/sles_migration | 4 ++++ xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le | 2 ++ xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm | 2 ++ xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le | 2 ++ xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm | 2 ++ 6 files changed, 16 insertions(+) diff --git a/xCAT-test/autotest/testcase/migration/redhat_migration b/xCAT-test/autotest/testcase/migration/redhat_migration index c2d43ff7b..57e67a268 100644 --- a/xCAT-test/autotest/testcase/migration/redhat_migration +++ b/xCAT-test/autotest/testcase/migration/redhat_migration @@ -97,6 +97,8 @@ cmd:xdsh $$CN "lsdef" check:output=~node0001 cmd:xdsh $$CN "noderm node0001" check:rc==0 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:latest_version_info=`lsxcatd -v`;xdsh $$CN "lsxcatd -v" | grep "$latest_version_info" check:rc==0 cmd:if [[ -f /tmp/servicelabel ]];then chdef $$SN -p groups=service;rm -rf /tmp/servicelabel;fi @@ -204,6 +206,8 @@ cmd:xdsh $$CN "lsdef" check:output=~node0001 cmd:xdsh $$CN "noderm node0001" check:rc==0 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:latest_version_info=`lsxcatd -v`;xdsh $$CN "lsxcatd -v" | grep "$latest_version_info" check:rc==0 cmd:if [[ -f /tmp/servicelabel ]];then chdef $$SN -p groups=service;rm -rf /tmp/servicelabel;fi diff --git a/xCAT-test/autotest/testcase/migration/sles_migration b/xCAT-test/autotest/testcase/migration/sles_migration index f20f56edb..36e6002fa 100644 --- a/xCAT-test/autotest/testcase/migration/sles_migration +++ b/xCAT-test/autotest/testcase/migration/sles_migration @@ -99,6 +99,8 @@ cmd:xdsh $$CN "lsdef" check:output=~node0001 cmd:xdsh $$CN "noderm node0001" check:rc==0 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:latest_version_info=`lsxcatd -v`;xdsh $$CN "lsxcatd -v" | grep "$latest_version_info" check:rc==0 cmd:if [[ -f /tmp/servicelabel ]];then chdef $$SN -p groups=service;rm -rf /tmp/servicelabel;fi @@ -209,6 +211,8 @@ cmd:xdsh $$CN "lsdef" check:output=~node0001 cmd:xdsh $$CN "noderm node0001" check:rc==0 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:latest_version_info=`lsxcatd -v`;xdsh $$CN "lsxcatd -v" | grep "$latest_version_info" check:rc==0 cmd:if [[ -f /tmp/servicelabel ]];then chdef $$SN -p groups=service;rm -rf /tmp/servicelabel;fi diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le index cf77bd24f..e9f12e354 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le @@ -118,6 +118,8 @@ cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef" check:output!~node0001 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:xdsh $$CN "diff /oldxcat/old_version /newxcat/new_version" check:rc!=0 diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm index 636553292..1c72822a7 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm @@ -117,6 +117,8 @@ cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef" check:output!~node0001 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:xdsh $$CN "diff /oldxcat/old_version /newxcat/new_version" check:rc!=0 end diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le index 1d3216e8c..a1509715b 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le @@ -118,6 +118,8 @@ cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef" check:output!~node0001 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:xdsh $$CN "diff /oldxcat/old_version /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 34c7123cb..d4af68b22 100644 --- a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm +++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm @@ -117,6 +117,8 @@ cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001" check:rc==0 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef" check:output!~node0001 +cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test" +check:rc==0 cmd:xdsh $$CN "diff /oldxcat/old_version /newxcat/new_version" check:rc!=0 end