From 7a64700eb2c93acffba7e2c5ea876cd29cc937d8 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 24 Dec 2015 12:45:37 -0800
Subject: [PATCH] use variables for release numbers in upgrade tests

Summary:
Along with the matching change to fedora-openqa-schedule to pass
these variables in when scheduling jobs, this avoids hardcoding
the release numbers for the upgrade tests (which means someone
has to remember to edit them every release). The new createhdds
similarly uses get_current_release() to decide what releases it
needs images for, so all this should hook up and work magically
without any human intervention required.

For clarity, the effect of the '_upgrade_' tests is "run an
upgrade from the 'current' Fedora release to whatever release
is being tested", and the effect of the '_upgrade_2_' tests is
"run an upgrade from the 'previous' Fedora release to whatever
release is being tested".

Test Plan:
Apply with D702, schedule upgrade tests, and make
sure the correct hard disk image filenames are used.

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D703
---
 templates | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates b/templates
index a550dfee..3bb647a1 100755
--- a/templates
+++ b/templates
@@ -1135,7 +1135,7 @@
                       settings => [
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f23_minimal_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_minimal_x86_64.img" },
                         { key => "UPGRADE", value => "minimal" },
                       ],
                     },
@@ -1144,7 +1144,7 @@
                       settings => [
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f23_desktop_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_desktop_x86_64.img" },
                         { key => "UPGRADE", value => "desktop" },
                         { key => "DESKTOP", value => "gnome" },
                       ],
@@ -1154,7 +1154,7 @@
                       settings => [
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f22_minimal_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_minimal_x86_64.img" },
                         { key => "UPGRADE", value => "minimal" },
                       ],
                     },
@@ -1163,7 +1163,7 @@
                       settings => [
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f22_desktop_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_desktop_x86_64.img" },
                         { key => "UPGRADE", value => "desktop" },
                         { key => "DESKTOP", value => "gnome" },
                       ],
@@ -1173,7 +1173,7 @@
                       settings => [
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f23_desktop_i686.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_desktop_i686.img" },
                         { key => "UPGRADE", value => "desktop" },
                         { key => "DESKTOP", value => "gnome" },
                       ],
@@ -1183,7 +1183,7 @@
                       settings => [
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f22_desktop_i686.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_desktop_i686.img" },
                         { key => "UPGRADE", value => "desktop" },
                         { key => "DESKTOP", value => "gnome" },
                       ],