From 47aab350235a048a0181df5e918e8215aebde052 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Tue, 18 Apr 2017 13:03:39 +0800 Subject: [PATCH] [testcase] Do xCAT upgrade by add `--force-resolution` to `zypper` --- xCAT-test/autotest/testcase/migration/sles_migration | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/migration/sles_migration b/xCAT-test/autotest/testcase/migration/sles_migration index 7a7236475..e287ec852 100644 --- a/xCAT-test/autotest/testcase/migration/sles_migration +++ b/xCAT-test/autotest/testcase/migration/sles_migration @@ -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