diff --git a/createhdds.py b/createhdds.py index 56d7981..552f1f4 100755 --- a/createhdds.py +++ b/createhdds.py @@ -417,19 +417,29 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None): curr = fedfind.helpers.get_current_release(branched=False) branch = fedfind.helpers.get_current_release(branched=True) if branch > curr: - release = branch + rels = [branch] else: logger.info("Branched image requested, but Branched does not currently exist") continue + elif release.lower() == 'stable': + # this means "all current stable releases" + rels = fedfind.helpers.get_current_stables() + elif release.lower() == 'current': + # this means "current stable release" + rels = [fedfind.helpers.get_current_release(branched=False)] elif release != 'rawhide' and int(release) < 0: # negative release indicates 'relative to next release' if not nextrel: nextrel = fedfind.helpers.get_current_release() + 1 - release = int(nextrel) + int(release) + rels = [int(nextrel) + int(release)] + else: + # assume a single integer release number + rels = [release] for arch in arches: - imgs.append( - VirtInstallImage(name, release, arch, variant=variant, size=size, imgver=imgver, - maxage=maxage)) + for rel in rels: + imgs.append( + VirtInstallImage(name, rel, arch, variant=variant, size=size, imgver=imgver, + maxage=maxage)) return imgs def get_all_images(hdds, nextrel=None): diff --git a/hdds.json b/hdds.json index f992b5e..b4f96f0 100644 --- a/hdds.json +++ b/hdds.json @@ -136,8 +136,7 @@ { "name" : "desktop", "releases" : { - "-1" : ["x86_64", "i686"], - "-2" : ["x86_64", "i686"], + "stable" : ["x86_64", "i686"], "branched": ["x86_64"] }, "size" : "20", @@ -156,8 +155,7 @@ { "name" : "server", "releases" : { - "-1" : ["x86_64"], - "-2" : ["x86_64"], + "stable" : ["x86_64"], "branched": ["x86_64"] }, "size" : "6", @@ -176,7 +174,7 @@ { "name" : "support", "releases" : { - "-1" : ["x86_64"] + "current" : ["x86_64"] }, "size" : "6", "imgver" : "3"