Skip to content

Commit 7fc773b

Browse files
authored
Merge pull request #6735 from xcat2/master
Merge from master to 2.16 branch for 2.16.0 release. (1)
2 parents a93c7c9 + a013138 commit 7fc773b

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

xCAT-test/autotest/testcase/go_xcat/case3

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ check:rc==0
2121
#Install additional packages on Red Hat
2222
cmd:if xdsh $$CN "grep \"Red Hat\" /etc/*release >/dev/null"; then xdsh $$CN "yum install -y yum-utils dnf-utils bzip2"; fi
2323

24-
#Pull down repomd.xml on SLES to prevent caching of the wrong file
25-
cmd:if xdsh $$CN "grep \"SUSE\" /etc/*release >/dev/null"; then xdsh $$CN "wget http://xcat.org/files/xcat/repos/yum/devel/core-snap/repodata/repomd.xml"; fi
24+
#Pull down core and deps repomd.xml on SLES to prevent caching of the wrong file
25+
cmd:if xdsh $$CN "grep \"SUSE\" /etc/*release >/dev/null"; then xdsh $$CN "wget --no-cache http://xcat.org/files/xcat/repos/yum/devel/core-snap/repodata/repomd.xml"; fi
26+
cmd:if xdsh $$CN "grep \"SUSE\" /etc/*release >/dev/null"; then os=`echo __GETNODEATTR($$CN,os)__ | cut -d "." -f1 | sed s/sle1/sles1/` && xdsh $$CN "wget --no-cache http://xcat.org/files/xcat/repos/yum/devel/xcat-dep/$os/__GETNODEATTR($$CN,arch)__/repodata/repomd.xml"; fi
2627

2728
#Install additional packages on Ubuntu
2829
cmd:if xdsh $$CN "grep \"Ubuntu\" /etc/*release >/dev/null"; then xdsh $$CN "DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg"; fi

xCAT-test/autotest/testcase/migration/sles_migration

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cmd:service dhcpd restart
2727
check:rc==0
2828
cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
2929
check:output=~$$CN
30-
cmd:copycds $$ISO
30+
cmd:copycds $$ISO | grep -v "%"
3131
check:rc==0
3232
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/commoncmd/retry_install.sh $$CN __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
3333
check:rc==0
@@ -146,7 +146,7 @@ cmd:service dhcpd restart
146146
check:rc==0
147147
cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
148148
check:output=~$$CN
149-
cmd:copycds $$ISO
149+
cmd:copycds $$ISO | grep -v "%"
150150
check:rc==0
151151
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/commoncmd/retry_install.sh $$CN __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
152152
check:rc==0
@@ -188,10 +188,11 @@ cmd:xdsh $$CN "zypper sl -U;zypper --gpg-auto-import-keys search --match-exact -
188188
check:rc==0
189189
cmd:xdsh $$CN "zypper -n install xCAT"
190190
check:rc==0
191-
cmd:xdsh $$CN "zypper -n install createrepo"
191+
# Name of createrepo package on sles15 is different from sles12
192+
cmd:if [ "__GETNODEATTR($$CN,os)__" = "sle15" ]; then xdsh $$CN "zypper -n install createrepo_c"; else xdsh $$CN "zypper -n install createrepo";fi
192193
check:rc==0
193194
cmd:xdsh $$CN "source /etc/profile.d/xcat.sh"
194-
eck:rc==0
195+
check:rc==0
195196
cmd:xdsh $$CN "lsxcatd -v"
196197
check:rc==0
197198
check:output=~$$MIGRATION2_VERSION

xCAT-test/autotest/testcase/nodeset/cases0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ label:others
171171
cmd:mkdef -t node -o testnode1 arch=ppc64el cons=ipmi groups=pbmc mgt=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1
172172
check:rc==0
173173
cmd:chdef testnode1 os=rhels7.5 netboot=petitboot
174-
eck:rc==0
174+
check:rc==0
175175
cmd: mkdef "rhels7.5-ppc64el-install-compute" -u profile=compute provmethod=install osvers=rhels7.5
176176
check:rc==0
177177
cmd:nodeset testnode1 osimage="rhels7.5-ppc64el-install-compute"

xCAT-test/autotest/testcase/xcat_inventory/cases.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ check:output ~=usage
8888
check:output ~= error: argument -f/--path: expected one argument
8989
cmd:xcat-inventory export -t node -o bogusnode --path
9090
check:rc!=0
91-
eck:output ~=usage
91+
check:output ~=usage
9292
check:output ~= error: argument -f/--path: expected one argument
9393
cmd:mkdir /tmp/xcat_inventory_export_option_f/testdir
9494
check:rc==0

0 commit comments

Comments
 (0)