kemotaha/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Pull Requests Activity

resolve #19

Browse Source 
Resolves PR #19 and makes both iso and live classes consistent.

Signed-off-by: Sergei Shtepa <sshtepa@noreply@resf.org>
Signed-off-by: Louis Abel <label@rockylinux.org>
This commit is contained in:
Louis Abel 2024-09-12 09:40:24 -07:00
parent 951558deb4
commit 8c775c308c
Signed by untrusted user: label
GPG Key ID: 2A6975660E424560
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
iso/empanadas/empanadas/util/iso_utils.py
View File

@ -81,12 +81,11 @@ class IsoBuild:
self.compose_root = config['compose_root'] self.compose_root = config['compose_root']
self.compose_base = config['compose_root'] + "/" + major self.compose_base = config['compose_root'] + "/" + major
self.current_arch = config['arch'] self.current_arch = config['arch']
self.required_pkgs = rlvars['iso_map']['lorax']['required_pkgs'] #self.required_pkgs = rlvars['iso_map']['lorax']['required_pkgs']
self.mock_work_root = config['mock_work_root'] self.mock_work_root = config['mock_work_root']
self.lorax_result_root = config['mock_work_root'] + "/" + "lorax" self.lorax_result_root = config['mock_work_root'] + "/" + "lorax"
self.mock_isolation = isolation self.mock_isolation = isolation
self.iso_map = rlvars['iso_map'] self.iso_map = rlvars['iso_map']
#self.livemap = rlvars['livemap']
self.cloudimages = rlvars['cloudimages'] self.cloudimages = rlvars['cloudimages']
self.release_candidate = rc self.release_candidate = rc
self.s3 = s3 self.s3 = s3
@ -253,6 +252,7 @@ class IsoBuild:
mock_iso_path = '/var/tmp/lorax-' + self.release + '.cfg' mock_iso_path = '/var/tmp/lorax-' + self.release + '.cfg'
mock_sh_path = '/var/tmp/isobuild.sh' mock_sh_path = '/var/tmp/isobuild.sh'
iso_template_path = '/var/tmp/buildImage.sh' iso_template_path = '/var/tmp/buildImage.sh'
required_pkgs = self.iso_map['lorax']['required_pkgs']
rclevel = '' rclevel = ''
if self.release_candidate: if self.release_candidate:
@ -829,6 +829,7 @@ class IsoBuild:
isoname = f'{self.shortname}-{self.release}{rclevel}{datestamp}-{arch}-{image}.iso' isoname = f'{self.shortname}-{self.release}{rclevel}{datestamp}-{arch}-{image}.iso'
generic_isoname = f'{self.shortname}-{arch}-{image}.iso' generic_isoname = f'{self.shortname}-{arch}-{image}.iso'
latest_isoname = f'{self.shortname}-{self.major_version}-latest-{arch}-{image}.iso' latest_isoname = f'{self.shortname}-{self.major_version}-latest-{arch}-{image}.iso'
required_pkgs = self.iso_map['lorax']['required_pkgs']
lorax_pkg_cmd = '/usr/bin/dnf install {} -y {}'.format( lorax_pkg_cmd = '/usr/bin/dnf install {} -y {}'.format(
' '.join(required_pkgs), ' '.join(required_pkgs),
@ -1518,7 +1519,7 @@ class LiveBuild:
self.compose_base = config['compose_root'] + "/" + major self.compose_base = config['compose_root'] + "/" + major
self.current_arch = config['arch'] self.current_arch = config['arch']
self.livemap = rlvars['livemap'] self.livemap = rlvars['livemap']
self.required_pkgs = rlvars['livemap']['required_pkgs'] #self.required_pkgs = rlvars['livemap']['required_pkgs']
self.mock_work_root = config['mock_work_root'] self.mock_work_root = config['mock_work_root']
self.live_result_root = config['mock_work_root'] + "/lmc" self.live_result_root = config['mock_work_root'] + "/lmc"
self.mock_isolation = isolation self.mock_isolation = isolation