prepare for additional live builders
This commit is contained in:
parent
5300649b09
commit
2ced55eab2
@ -103,6 +103,7 @@
|
||||
format: box
|
||||
variants: [Libvirt, Vbox, VMware]
|
||||
livemap:
|
||||
builder: "lorax"
|
||||
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
|
||||
branch: 'r10'
|
||||
ksentry:
|
||||
|
@ -103,6 +103,7 @@
|
||||
format: box
|
||||
variants: [Libvirt, Vbox, VMware]
|
||||
livemap:
|
||||
builder: "lorax"
|
||||
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
|
||||
branch: 'r10'
|
||||
ksentry:
|
||||
|
@ -103,6 +103,7 @@
|
||||
format: box
|
||||
variants: [Libvirt, Vbox, VMware]
|
||||
livemap:
|
||||
builder: "lorax"
|
||||
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
|
||||
branch: 'r9-beta'
|
||||
ksentry:
|
||||
|
@ -103,6 +103,7 @@
|
||||
format: box
|
||||
variants: [Libvirt, Vbox, VMware]
|
||||
livemap:
|
||||
builder: "lorax"
|
||||
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
|
||||
branch: 'r9'
|
||||
ksentry:
|
||||
|
@ -103,6 +103,7 @@
|
||||
format: box
|
||||
variants: [Libvirt, Vbox, VMware]
|
||||
livemap:
|
||||
builder: "lorax"
|
||||
git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
|
||||
branch: 'r9'
|
||||
ksentry:
|
||||
|
@ -18,6 +18,7 @@ parser.add_argument('--live-iso-mode', type=str, default='local')
|
||||
parser.add_argument('--hashed', action='store_true')
|
||||
parser.add_argument('--just-copy-it', action='store_true', help="Just copy the images to the compose dir")
|
||||
parser.add_argument('--force-build', action='store_true', help="Just build and overwrite the images")
|
||||
parser.add_argument('--builder', type=str, help="Choose a builder type and override the set value in the configs")
|
||||
results = parser.parse_args()
|
||||
rlvars = rldict[results.release]
|
||||
major = rlvars['major']
|
||||
@ -34,6 +35,7 @@ a = LiveBuild(
|
||||
hashed=results.hashed,
|
||||
justcopyit=results.just_copy_it,
|
||||
force_build=results.force_build,
|
||||
builder=results.builder,
|
||||
logger=results.logger
|
||||
)
|
||||
|
||||
|
@ -1547,6 +1547,7 @@ class LiveBuild:
|
||||
updated_image: bool = False,
|
||||
image_increment: str = '0',
|
||||
peridot: bool = False,
|
||||
builder: str = 'default',
|
||||
logger=None
|
||||
):
|
||||
|
||||
@ -1576,6 +1577,16 @@ class LiveBuild:
|
||||
self.hashed = hashed
|
||||
self.peridot = peridot
|
||||
|
||||
# determine builder to use. if a config doesn't have it set, assume
|
||||
# lorax, the default option.
|
||||
if rlvars['livemap']['builder']:
|
||||
self.livebuilder = rlvars['livemap']['builder']
|
||||
else:
|
||||
self.livebuilder = "lorax"
|
||||
|
||||
if builder == "default":
|
||||
self.livebuilder = builder
|
||||
|
||||
# Relevant major version items
|
||||
self.arch = config['arch']
|
||||
self.arches = rlvars['allowed_arches']
|
||||
@ -1671,6 +1682,11 @@ class LiveBuild:
|
||||
self.log.error(Color.FAIL + 'Running an unsupported architecture.')
|
||||
raise SystemExit()
|
||||
|
||||
# Check that the builder is lorax, we don't support anything else yet
|
||||
if self.livebuilder != "lorax":
|
||||
self.log.error(Color.FAIL + 'Attempting to use an unsupported builder.')
|
||||
raise SystemExit()
|
||||
|
||||
self._live_iso_build_wrap()
|
||||
|
||||
self.log.info('Compose repo directory: %s' % sync_root)
|
||||
|
Loading…
Reference in New Issue
Block a user