From 57011694c6e359073367579e87645ced8efc7bcc Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 24 Apr 2019 04:02:42 -0400 Subject: [PATCH 1/2] update kit cases to apply in xcat container --- xCAT-test/autotest/testcase/addkitcomp/case0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/addkitcomp/case0 b/xCAT-test/autotest/testcase/addkitcomp/case0 index 1265e1d4d..d56567791 100644 --- a/xCAT-test/autotest/testcase/addkitcomp/case0 +++ b/xCAT-test/autotest/testcase/addkitcomp/case0 @@ -39,11 +39,12 @@ check:rc==0 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/mykits/mykits-1.0-1.tar.bz2 check:rc==0 check:output=~Kit mykits-1.0-1 was successfully added -cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ osvers=$osbasename-$osmajorversion.$osminorversion;mkdef -t osdistro $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__ basename=$osbasename majorversion=$osmajorversion minorversion=$osminorversion arch=__GETNODEATTR($$CN,arch)__ type=Linux dirpaths=/install/$osbasename-$osmajorversion.$osminorversion/__GETNODEATTR($$CN,arch)__;else mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__;fi check:rc==0 cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname check:rc==0 check:output=~Assigning kit component +end cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;rmkitcomp -i testimage $kitcompname check:rc==0 check:output=~Removing kitcomponent From 03a1a22c02b8137b21a6a1acdfc55b51444bf8e6 Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 24 Apr 2019 22:34:25 -0400 Subject: [PATCH 2/2] update kit test cases to apply in xcat container --- xCAT-test/autotest/testcase/addkitcomp/case0 | 5 +++-- xCAT-test/autotest/testcase/chkkitcomp/cases0 | 3 ++- xCAT-test/autotest/testcase/rmkit/case0 | 9 ++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/xCAT-test/autotest/testcase/addkitcomp/case0 b/xCAT-test/autotest/testcase/addkitcomp/case0 index d56567791..49dd8b561 100644 --- a/xCAT-test/autotest/testcase/addkitcomp/case0 +++ b/xCAT-test/autotest/testcase/addkitcomp/case0 @@ -44,11 +44,11 @@ check:rc==0 cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname check:rc==0 check:output=~Assigning kit component -end cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;rmkitcomp -i testimage $kitcompname check:rc==0 check:output=~Removing kitcomponent check:output=~were removed from osimage testimage successfully +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;rmdef -t osdistro -o $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__;fi cmd:rmkit mykits-1.0-1 check:rc==0 cmd:rm -f /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/mykits/mykits-1.0-1.tar.bz2 @@ -71,7 +71,7 @@ check:rc==0 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/mykits/mykits-1.0-1.tar.bz2 check:rc==0 check:output=~Kit mykits-1.0-1 was successfully added -cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ osvers=$osbasename-$osmajorversion.$osminorversion;mkdef -t osdistro $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__ basename=$osbasename majorversion=$osmajorversion minorversion=$osminorversion arch=__GETNODEATTR($$CN,arch)__ type=Linux dirpaths=/install/$osbasename-$osmajorversion.$osminorversion/__GETNODEATTR($$CN,arch)__;else mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__;fi check:rc==0 cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -f -i testimage $kitcompname check:rc==0 @@ -80,6 +80,7 @@ cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;rmki check:rc==0 check:output=~Removing kitcomponent check:output=~were removed from osimage testimage successfully +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;rmdef -t osdistro -o $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__;fi cmd:rmkit mykits-1.0-1 check:rc==0 cmd:rm -f /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/mykits/mykits-1.0-1.tar.bz2 diff --git a/xCAT-test/autotest/testcase/chkkitcomp/cases0 b/xCAT-test/autotest/testcase/chkkitcomp/cases0 index 2a8ea8935..0e46d2b1f 100644 --- a/xCAT-test/autotest/testcase/chkkitcomp/cases0 +++ b/xCAT-test/autotest/testcase/chkkitcomp/cases0 @@ -29,7 +29,7 @@ check:rc==0 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/chkkitcomp/mykits/mykits-1.0-1.tar.bz2 check:rc==0 check:output=~Kit mykits-1.0-1 was successfully added -cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ osvers=$osbasename-$osmajorversion.$osminorversion;mkdef -t osdistro $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__ basename=$osbasename majorversion=$osmajorversion minorversion=$osminorversion arch=__GETNODEATTR($$CN,arch)__ type=Linux dirpaths=/install/$osbasename-$osmajorversion.$osminorversion/__GETNODEATTR($$CN,arch)__;else mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__;fi check:rc==0 cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname check:rc==0 @@ -42,6 +42,7 @@ check:rc==0 check:output=~compatible with osimage testimage cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;rmkitcomp -i testimage $kitcompname check:rc==0 +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;rmdef -t osdistro -o $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__;fi cmd:rmkit mykits-1.0-1 check:rc==0 cmd:rm -f /opt/xcat/share/xcat/tools/autotest/testcase/chkkitcomp/mykits/mykits-1.0-1.tar.bz2 diff --git a/xCAT-test/autotest/testcase/rmkit/case0 b/xCAT-test/autotest/testcase/rmkit/case0 index 9cbad4994..b005c9752 100644 --- a/xCAT-test/autotest/testcase/rmkit/case0 +++ b/xCAT-test/autotest/testcase/rmkit/case0 @@ -64,7 +64,7 @@ check:rc==0 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/rmkit/mykits/mykits-1.0-1.tar.bz2 check:rc==0 check:output=~Kit mykits-1.0-1 was successfully added -cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ osvers=$osbasename-$osmajorversion.$osminorversion;mkdef -t osdistro $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__ basename=$osbasename majorversion=$osmajorversion minorversion=$osminorversion arch=__GETNODEATTR($$CN,arch)__ type=Linux dirpaths=/install/$osbasename-$osmajorversion.$osminorversion/__GETNODEATTR($$CN,arch)__;else mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__;fi check:rc==0 cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname check:rc==0 @@ -79,6 +79,7 @@ cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;rmki check:rc==0 check:output=~Removing kitcomponent check:output=~were removed from osimage testimage successfully +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;rmdef -t osdistro -o $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__;fi cmd:rmkit mykits-1.0-1 check:rc==0 cmd:rm -f /opt/xcat/share/xcat/tools/autotest/testcase/rmkit/mykits/mykits-1.0-1.tar.bz2 @@ -101,11 +102,12 @@ check:rc==0 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/rmkit/mykits/mykits-1.0-1.tar.bz2 check:rc==0 check:output=~Kit mykits-1.0-1 was successfully added -cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ osvers=$osbasename-$osmajorversion.$osminorversion;mkdef -t osdistro $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__ basename=$osbasename majorversion=$osmajorversion minorversion=$osminorversion arch=__GETNODEATTR($$CN,arch)__ type=Linux dirpaths=/install/$osbasename-$osmajorversion.$osminorversion/__GETNODEATTR($$CN,arch)__;else mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__;fi check:rc==0 cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname check:rc==0 check:output=~Assigning kit component +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;rmdef -t osdistro -o $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__;fi cmd:rmkit -f mykits-1.0-1 check:rc==0 check:output=~Removing kit mykits-1.0-1 @@ -131,11 +133,12 @@ check:rc==0 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/rmkit/mykits/mykits-1.0-1.tar.bz2 check:rc==0 check:output=~Kit mykits-1.0-1 was successfully added -cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__ osvers=$osbasename-$osmajorversion.$osminorversion;mkdef -t osdistro $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__ basename=$osbasename majorversion=$osmajorversion minorversion=$osminorversion arch=__GETNODEATTR($$CN,arch)__ type=Linux dirpaths=/install/$osbasename-$osmajorversion.$osminorversion/__GETNODEATTR($$CN,arch)__;else mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__;fi check:rc==0 cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname check:rc==0 check:output=~Assigning kit component +cmd:if grep "CentOS Linux" /etc/*release;then osbasename=`lskit mykits-1.0-1 |grep -w osbasename|awk -F= '{print $2}'`;osmajorversion=`lskit mykits-1.0-1 |grep osmajorversion|awk -F= '{print $2}'`;osminorversion=`lskit mykits-1.0-1 |grep osminorversion|awk -F= '{print $2}'`;rmdef -t osdistro -o $osbasename-$osmajorversion.$osminorversion-__GETNODEATTR($$CN,arch)__;fi cmd:rmkit -f mykits-1.0-1 -V check:rc==0 check:output=~Removing kit mykits-1.0-1