2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 12:20:40 +00:00

Merge pull request #2878 from neo954/issue2835-sles-migration

[testcase] Do xCAT upgrade by add `--force-resolution` to `zypper`
This commit is contained in:
Bin Xu
2017-04-21 14:21:10 +08:00
committed by GitHub

View File

@ -88,7 +88,7 @@ cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2"
check:rc==0
cmd:xdsh $$CN "cd /root/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c14`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
check:rc==0
cmd:xdsh $$CN "zypper refresh;zypper -n update '*xCAT*'"
cmd:xdsh $$CN "zypper refresh;zypper -n update \$(rpm -q --queryformat '%{vendor}\n' xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64 | grep -q -v '^IBM Corp\.$' && echo --force-resolution) '*xCAT*'"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0
@ -191,7 +191,7 @@ cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2"
check:rc==0
cmd:xdsh $$CN "cd /root/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c14`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
check:rc==0
cmd:xdsh $$CN "zypper refresh;zypper -n update '*xCAT*'"
cmd:xdsh $$CN "zypper refresh;zypper -n update \$(rpm -q --queryformat '%{vendor}\n' xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64 | grep -q -v '^IBM Corp\.$' && echo --force-resolution) '*xCAT*'"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0