Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IPU: adjust steps for getting rhsm pool id while doing IPU with rhsm #3654

Merged
merged 1 commit into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions provider/in_place_upgrade_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ def rhsm(self, test):
get_poolid = self.params.get("get_pool_id")
s, output = self.session.cmd_status_output(get_poolid, timeout=600)
attach_pool = self.params.get("attach_pool") + output
if output == "":
test.cancel("No pool is found, please check the server")
self.session.cmd(attach_pool, timeout=600)
ena_content = self.params.get("enable_content")
self.session.cmd(ena_content, timeout=3000)
Expand Down
3 changes: 1 addition & 2 deletions qemu/tests/in_place_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,11 @@ def run(test, params, env):
# process upgrade
upgrade_test.upgrade_process(params.get("process_upgrade_no_rhsm"))
elif params.get("rhsm_type") == "rhsm":
upgrade_test.rhsm(test)
if params.get("com_install") == "yes":
upgrade_test.run_guest_cmd(params.get("ins_leapp_cmd"))
upgrade_test.run_guest_cmd(params.get("prepare_env"))
upgrade_test.run_guest_cmd(params.get("get_answer_files_source"))
upgrade_test.run_guest_cmd(params.get("get_answer_files"))
upgrade_test.rhsm(test)
upgrade_test.session = vm.reboot(upgrade_test.session)
upgrade_test.pre_upgrade_whitelist(test)
upgrade_test.run_guest_cmd(params.get("pre_upgrade_rhsm"))
Expand Down