From b6e7b6de3c8745c14a087c971197a9b04e430cb6 Mon Sep 17 00:00:00 2001 From: Min Deng Date: Mon, 17 Apr 2023 11:41:46 +0800 Subject: [PATCH] IPU: dynamically set rhel version if test is with rhsm Signed-off-by: Min Deng --- provider/in_place_upgrade_base.py | 5 ++++- qemu/tests/cfg/in_place_upgrade.cfg | 2 +- qemu/tests/cfg/in_place_upgrade_legacy.cfg | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/provider/in_place_upgrade_base.py b/provider/in_place_upgrade_base.py index 241992a83c..11c443bcce 100644 --- a/provider/in_place_upgrade_base.py +++ b/provider/in_place_upgrade_base.py @@ -82,7 +82,10 @@ def rhsm(self, test): self.session.cmd(ena_content, timeout=3000) self.session.cmd(self.params.get("stop_yum_update")) self.session.cmd(self.params.get("check_repo_list"), timeout=300) - self.session.cmd(self.params.get("set_release"), timeout=300) + o = self.session.cmd_output(self.params.get("check_rhel_ver"), timeout=60) + set_ver = o[:1] + "." + o[1:] + set_ver_com = self.params.get("set_release") + set_ver + self.session.cmd(set_ver_com, timeout=300) update_vm = self.params.get("yum_update") self.session.cmd(update_vm, timeout=6000) except Exception as error: diff --git a/qemu/tests/cfg/in_place_upgrade.cfg b/qemu/tests/cfg/in_place_upgrade.cfg index b41e6b3f7f..c02633bd6b 100644 --- a/qemu/tests/cfg/in_place_upgrade.cfg +++ b/qemu/tests/cfg/in_place_upgrade.cfg @@ -88,4 +88,4 @@ # since it's not ready on CDN server # set_release = "subscription-manager release --set 8.7" attach_pool = "subscription-manager attach --pool " - set_release = "subscription-manager release --set 8.6" + set_release = "subscription-manager release --set " diff --git a/qemu/tests/cfg/in_place_upgrade_legacy.cfg b/qemu/tests/cfg/in_place_upgrade_legacy.cfg index 45d86eb161..f233d5ba0f 100644 --- a/qemu/tests/cfg/in_place_upgrade_legacy.cfg +++ b/qemu/tests/cfg/in_place_upgrade_legacy.cfg @@ -75,4 +75,4 @@ enable_content += " --enable rhel-7-for-system-z-rpms" get_pool_id = "rhsm_get_poolid RH0451709" attach_pool = "subscription-manager attach --pool " - set_release = "subscription-manager release --set 7.9" + set_release = "subscription-manager release --set "