correct comments, fix livemap configs

This commit is contained in:
Louis Abel 2022-07-06 07:44:37 -07:00
parent b54447571b
commit 73f08780d9
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
5 changed files with 54 additions and 17 deletions

View File

@ -77,12 +77,12 @@
- GenericCloud
livemap:
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
branch: 'r9'
branch: 'r9-beta'
ksentry:
- rocky-live-workstation.ks
- rocky-live-workstation-lite.ks
- rocky-live-xfce.ks
- rocky-live-kde.ks
Workstation: rocky-live-workstation.ks
Workstation-Lite: rocky-live-workstation-lite.ks
XFCE: rocky-live-xfce.ks
KDE: rocky-live-kde.ks
allowed_arches:
- x86_64
repoclosure_map:

View File

@ -77,12 +77,12 @@
- GenericCloud
livemap:
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
branch: 'r9-beta'
branch: 'r9'
ksentry:
- rocky-live-workstation.ks
- rocky-live-workstation-lite.ks
- rocky-live-xfce.ks
- rocky-live-kde.ks
Workstation: rocky-live-workstation.ks
Workstation-Lite: rocky-live-workstation-lite.ks
XFCE: rocky-live-xfce.ks
KDE: rocky-live-kde.ks
allowed_arches:
- x86_64
repoclosure_map:

View File

@ -79,10 +79,10 @@
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
branch: 'r9lh'
ksentry:
- rocky-live-workstation.ks
- rocky-live-workstation-lite.ks
- rocky-live-xfce.ks
- rocky-live-kde.ks
Workstation: rocky-live-workstation.ks
Workstation-Lite: rocky-live-workstation-lite.ks
XFCE: rocky-live-xfce.ks
KDE: rocky-live-kde.ks
allowed_arches:
- x86_64
repoclosure_map:

View File

@ -0,0 +1,35 @@
# builds ISO's
import argparse
from empanadas.common import *
from empanadas.util import Checks
from empanadas.util import IsoBuild
parser = argparse.ArgumentParser(description="Live ISO Compose")
parser.add_argument('--release', type=str, help="Major Release Version or major-type (eg 9-beta)", required=True)
parser.add_argument('--arch', type=str, help="Architecture")
parser.add_argument('--isolation', type=str, help="Mock Isolation")
parser.add_argument('--local-compose', action='store_true', help="Compose Directory is Here")
parser.add_argument('--image', action='store_true', help="Compose Directory is Here")
parser.add_argument('--logger', type=str)
parser.add_argument('--live-iso-mode', type=str, default='local')
results = parser.parse_args()
rlvars = rldict[results.release]
major = rlvars['major']
a = IsoBuild(
rlvars,
config,
major=major,
arch=results.arch,
isolation=results.isolation,
extra_iso_mode=results.live_iso_mode,
image=results.image,
compose_dir_is_here=results.local_compose,
logger=results.logger
)
def run():
a.run_build_extra_iso()

View File

@ -42,9 +42,8 @@ class IsoBuild:
This helps us build the generic ISO's for a Rocky Linux release. In
particular, this is for the boot images.
While there is a function for building the DVD and live images, this not
the main design of this class. The other functions can be called on their
own to facilitate those particular builds.
There are functions to build the DVD (and potentially other) images. Each
particular build or process starts with "run" in their name.
"""
def __init__(
self,
@ -83,6 +82,7 @@ class IsoBuild:
self.lorax_result_root = config['mock_work_root'] + "/" + "lorax"
self.mock_isolation = isolation
self.iso_map = rlvars['iso_map']
self.livemap = rlvars['livemap']
self.cloudimages = rlvars['cloudimages']
self.release_candidate = rc
self.s3 = s3
@ -1617,6 +1617,8 @@ class IsoBuild:
self.log.info(Color.INFO + 'Starting Live ISOs phase')
# Check that the arch we've assigned is valid...
self._live_iso_build_wrap()
self.log.info('Compose repo directory: %s' % sync_root)