xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-23 03:30:33 +00:00
Code Issues Releases Wiki Activity

modify testcase of xcat-inventory environement based on code modify (#5397)

Browse Source
This commit is contained in:
xuweibj
2018-07-13 11:19:52 +08:00
committed by yangsong
parent aaf6c8db8d
commit 7106de5df8
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-test/autotest/testcase/xcat-inventory/cases.environment
View File

@@ -21,7 +21,7 @@ check:rc==0
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
check:rc==0
cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
check:output=~Importing object: test.environments.osimage
check:output=~Inventory import successfully!
check:rc==0
@@ -31,7 +31,6 @@ cmd:genimage test.environments.osimage
check:rc==0
cmd:packimage test.environments.osimage
check:rc==0
cmd:rinstall $$CN osimage=test.environments.osimage
check:rc==0
check:output=~Provision node\(s\)\: $$CN
@@ -86,7 +85,7 @@ label:others,xcat_inventory
cmd:lsdef -t osimage -o test.environments.osimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test.environments.osimage -z >/tmp/test.environments.osimage_image.stanza ;rmdef -t osimage -o test.environments.osimage;fi
check:rc==0
cmd:dir="/tmp/export";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi; mkdir -p $dir
cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml
cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
check:output=~Importing object: test.environments.osimage
check:output=~Inventory import successfully!
check:rc==0
@@ -101,7 +100,7 @@ cmd:diff -y /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templat
check:rc==0
cmd:rmdef -t osimage -o test.environments.osimage
check:rc==0
cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json
cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
check:output=~Importing object: test.environments.osimage
check:output=~Inventory import successfully!
check:rc==0

2
xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall
View File

@@ -48,5 +48,5 @@ fi
# [ -r $workdir/$profile.$ext ] && cat $workdir/$profile.$ext | grep -E '^[[:space:]]*#.*[[:space:]]\$Id' >> $installroot/etc/IMGVERSION
#done
echo "test postisntall" >> $installroot/tmp/test1.postinstall
${GITREPO}/postinstall/test2.postinstall
${GITREPO}/postinstall/test2.postinstall $installroot

6
xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
View File

@@ -2,8 +2,8 @@ osimage:
test.environments.osimage:
basic_attributes:
arch: ppc64le
distribution: rhels7.5-alternate
osdistro: rhels7.5-alternate-ppc64le
distribution: rhels7.5
osdistro: rhels7.5-ppc64le
osname: Linux
filestosync: {{GITREPO}}/syncfiles/synclist
deprecated:
@@ -16,7 +16,7 @@ osimage:
package_selection:
otherpkgdir: {{SWDIR}}/otherpkgdir/
otherpkglist: {{GITREPO}}/otherpkglist/test1.otherpkglist,{{GITREPO}}/otherpkglist/test2.otherpkglist,
pkgdir: /install/rhels7.5-alternate/ppc64le,{{SWDIR}}/pkgdir/
pkgdir: /install/rhels7.5/ppc64le,{{SWDIR}}/pkgdir/
pkglist: /opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.pkglist,{{GITREPO}}/pkglist/test1.pkglist,{{GITREPO}}/pkglist/test2.pkglist
provision_mode: netboot
role: compute