From 658e08241828ad66485de4d0390f171833b0bbcd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 27 Jul 2017 12:56:26 -0700
Subject: [PATCH] Allow 'stable' and 'current' as release for virt-install
 images

'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.
---
 createhdds.py | 20 +++++++++++++++-----
 hdds.json     |  8 +++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

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"