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.

Sign up for GitHub

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

tests: remove workaround for ELN #610

Merged
merged 1 commit into from
Jan 23, 2025
Merged

tests: remove workaround for ELN #610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions test/machine_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ def start(self):
# kernel arguments to load the LiveOS/squashfs.img file as that's where everything is stored.
volume_id = self.get_volume_id(iso_path)
extra_args = f"root=live:CDLABEL={volume_id} rd.live.image quiet rhgb"
elif self.is_eln():
# FIXME: Remove this once https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/674 is released
# and version is present in the task container
location = f"{iso_path},kernel=images/pxeboot/vmlinuz,initrd=images/pxeboot/initrd.img"
else:
location = f"{iso_path}"

Expand Down Expand Up @@ -215,8 +211,5 @@ def wait_poweroff(self):
def is_live(self):
return "live" in self.image

def is_eln(self):
return "eln" in self.image

def get_volume_id(self, iso_path):
return subprocess.check_output(fr"isoinfo -d -i {iso_path} | grep -oP 'Volume id: \K.*'", shell=True).decode(sys.stdout.encoding).strip()
Loading