2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00

Merge pull request #5772 from neo954/sles-migration

Patch sles_migration test cases. Workaround for github issue #5503
This commit is contained in:
Yuan Bai 2018-11-12 14:34:15 +08:00 committed by GitHub
commit 482604f7e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -90,7 +90,11 @@ 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 --gpg-auto-import-keys update --force-resolution '*xCAT*'"
# Workaround github issue #5503
cmd:xdsh $$CN "grep -q 11 /etc/SuSE-release && ( sed -i -e 's#gpgcheck=1#gpgcheck=0#' /etc/zypp/repos.d/xcat-core.repo; sed -i -e 's#gpgcheck=1#gpgcheck=0#' /etc/zypp/repos.d/xcat-dep.repo )"
cmd:xdsh $$CN "zypper --gpg-auto-import-keys -n refresh"
cmd:xdsh $$CN "grep -q 11 /etc/SuSE-release && rpm -e --allmatches gpg-pubkey-ca548a47-5b2c830b"
cmd:xdsh $$CN "zypper refresh;zypper -n update --force-resolution '*xCAT*'"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0
@ -200,7 +204,11 @@ 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 --gpg-auto-import-keys update --force-resolution '*xCAT*'"
# Workaround github issue #5503
cmd:xdsh $$CN "grep -q 11 /etc/SuSE-release && ( sed -i -e 's#gpgcheck=1#gpgcheck=0#' /etc/zypp/repos.d/xcat-core.repo; sed -i -e 's#gpgcheck=1#gpgcheck=0#' /etc/zypp/repos.d/xcat-dep.repo )"
cmd:xdsh $$CN "zypper --gpg-auto-import-keys -n refresh"
cmd:xdsh $$CN "grep -q 11 /etc/SuSE-release && rpm -e --allmatches gpg-pubkey-ca548a47-5b2c830b"
cmd:xdsh $$CN "zypper refresh;zypper -n update --force-resolution '*xCAT*'"
check:rc==0
cmd:xdsh $$CN "service xcatd status"
check:rc==0