xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-02 19:40:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6683 from gurevichmark/squashfs_testcase2

Browse Source 
Make sure squashfs-tools installed on Ubuntu for squashfs testcase
This commit is contained in:
cxhong 2020-04-27 16:29:12 -04:00 committed by GitHub
commit 9f6a9d3830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat
View File

@ -129,6 +129,10 @@ cmd:cat /tmp/mountoutput/file.new
cmd:diff /tmp/mountoutput/file.org /tmp/mountoutput/file.new --ignore-matching-lines="fusectl"
check:rc==0
cmd:rm -rf /tmp/mountoutput
#Make sure squashfs-tools rpm is installed on Ubuntu
cmd:if [ "$$OS" = "ubuntu" ];then apt-get install -y squashfs-tools; fi
cmd:packimage -m squashfs __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
check:rc==0
check:output=~archive method:squashfs

6
xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy
View File

@ -152,7 +152,11 @@ cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu16.04.5" ]] && [[ "__GETNODEATTR(
cmd:lsdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
check:rc==0
cmd:packimage -m squashfs__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
#Make sure squashfs-tools rpm is installed on Ubuntu
cmd:if [ "$$OS" = "ubuntu" ];then apt-get install -y squashfs-tools; fi
cmd:packimage -m squashfs __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
check:rc==0
check:output=~archive method:squashfs