testing/createhdds
11
0
Fork 0
mirror of https://github.com/rocky-linux/createhdds.git synced 2024-12-23 02:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow 'stable' and 'current' as release for virt-install images

Browse Source 
'stable' means 'all current stable releases', and is used for
desktop and server as we need to ensure we have those images
available for all stable releases (including the '-3' release
while it's not EOL) for update testing. (Currently, F24 update
tests are all failing as the images are missing).

'current' means 'the current stable release' - it's the same as
'-1', but just easier to understand. It's used for support.
This commit is contained in:
Adam Williamson 2017-07-27 12:56:26 -07:00
parent 6d997b2f80
commit 658e082418
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
createhdds.py
View File

@ -417,18 +417,28 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
curr = fedfind.helpers.get_current_release(branched=False) curr = fedfind.helpers.get_current_release(branched=False)
branch = fedfind.helpers.get_current_release(branched=True) branch = fedfind.helpers.get_current_release(branched=True)
if branch > curr: if branch > curr:
release = branch rels = [branch]
else: else:
logger.info("Branched image requested, but Branched does not currently exist") logger.info("Branched image requested, but Branched does not currently exist")
continue 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: elif release != 'rawhide' and int(release) < 0:
# negative release indicates 'relative to next release' # negative release indicates 'relative to next release'
if not nextrel: if not nextrel:
nextrel = fedfind.helpers.get_current_release() + 1 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: for arch in arches:
for rel in rels:
imgs.append( imgs.append(
VirtInstallImage(name, release, arch, variant=variant, size=size, imgver=imgver, VirtInstallImage(name, rel, arch, variant=variant, size=size, imgver=imgver,
maxage=maxage)) maxage=maxage))
return imgs return imgs

8
hdds.json
View File

@ -136,8 +136,7 @@
{ {
"name" : "desktop", "name" : "desktop",
"releases" : { "releases" : {
"-1" : ["x86_64", "i686"], "stable" : ["x86_64", "i686"],
"-2" : ["x86_64", "i686"],
"branched": ["x86_64"] "branched": ["x86_64"]
}, },
"size" : "20", "size" : "20",
@ -156,8 +155,7 @@
{ {
"name" : "server", "name" : "server",
"releases" : { "releases" : {
"-1" : ["x86_64"], "stable" : ["x86_64"],
"-2" : ["x86_64"],
"branched": ["x86_64"] "branched": ["x86_64"]
}, },
"size" : "6", "size" : "6",
@ -176,7 +174,7 @@
{ {
"name" : "support", "name" : "support",
"releases" : { "releases" : {
"-1" : ["x86_64"] "current" : ["x86_64"]
}, },
"size" : "6", "size" : "6",
"imgver" : "3" "imgver" : "3"