diff --git a/xCAT-test/autotest/testcase/migration/sles_migration b/xCAT-test/autotest/testcase/migration/sles_migration index 40475f946..5a1f2d991 100644 --- a/xCAT-test/autotest/testcase/migration/sles_migration +++ b/xCAT-test/autotest/testcase/migration/sles_migration @@ -61,6 +61,12 @@ cmd:xdsh $$CN "/oldxcat/xcat-core/mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "cd /oldxcat/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c14`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" check:rc==0 +# 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 --no-gpg-checks refresh" +cmd:xdsh $$CN "grep -q 11 /etc/SuSE-release && rpm -e --allmatches gpg-pubkey-ca548a47-5b2c830b" +cmd:xdsh $$CN "zypper refresh" +check:rc==0 cmd:xdsh $$CN "zypper sl -U;zypper --gpg-auto-import-keys search --match-exact -s screen" check:rc==0 cmd:xdsh $$CN "zypper -n install xCAT" @@ -93,7 +99,7 @@ cmd:xdsh $$CN "cd /root/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c check:rc==0 # 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 "zypper --gpg-auto-import-keys -n --no-gpg-checks 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 @@ -176,6 +182,12 @@ cmd:xdsh $$CN "/oldxcat/xcat-core/mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "cd /oldxcat/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c14`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" check:rc==0 +# 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 --no-gpg-checks refresh" +cmd:xdsh $$CN "grep -q 11 /etc/SuSE-release && rpm -e --allmatches gpg-pubkey-ca548a47-5b2c830b" +cmd:xdsh $$CN "zypper refresh" +check:rc==0 cmd:xdsh $$CN "zypper sl -U;zypper --gpg-auto-import-keys search --match-exact -s screen" check:rc==0 cmd:xdsh $$CN "zypper -n install xCAT" @@ -208,7 +220,7 @@ cmd:xdsh $$CN "cd /root/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c check:rc==0 # 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 "zypper --gpg-auto-import-keys -n --no-gpg-checks 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