From f5d5d47a08e4b3ec7383f2ddd6f0780b0a78a399 Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig@stackhpc.com>
Date: Sun, 21 Feb 2021 16:36:19 +0000
Subject: [PATCH] Update for CentOS7-vault element

Add definitions for CentOS 7.8 and 7.9
NOTE: CentOS 7.9 is currently only partially available on CentOS Vault.
---
 elements/centos7-vault/README.rst             |  2 +-
 .../environment.d/10-centos7-distro-name.bash | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/elements/centos7-vault/README.rst b/elements/centos7-vault/README.rst
index 5dea4e3..127b333 100644
--- a/elements/centos7-vault/README.rst
+++ b/elements/centos7-vault/README.rst
@@ -10,7 +10,7 @@ the baseline for built disk images.
 DIB_CENTOS7_VERSION:
   :Required: No
   :Default: 7.6
-  :Description: Set a version, from 7.1 to 7.7 (inclusive) and the last-known
+  :Description: Set a version, from 7.1 to 7.9 (inclusive) and the last-known
                 public locations for package repos and cloud images will be used.
 
 DIB_CENTOS7_MIRROR_VERSION:
diff --git a/elements/centos7-vault/environment.d/10-centos7-distro-name.bash b/elements/centos7-vault/environment.d/10-centos7-distro-name.bash
index 5800bbb..a5cc6a8 100644
--- a/elements/centos7-vault/environment.d/10-centos7-distro-name.bash
+++ b/elements/centos7-vault/environment.d/10-centos7-distro-name.bash
@@ -7,33 +7,52 @@ export YUM=${YUM:-yum}
 # At the time of writing CentOS 7.7 is still current and the vault content is incomplete.
 export DIB_CENTOS7_VERSION=${DIB_CENTOS7_VERSION:-"7.6"}
 case "$DIB_CENTOS7_VERSION" in
+    7.9)
+        # At the time of writing CentOS 7.9 is still current and the vault content is incomplete.
+        DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.9.2009"}
+        DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-2009"}
+        # The CentOS 7.9 cloud image appears to be have been published without the .qcow.xz
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2c"
+        ;;
+    7.8)
+        DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.8.2003"}
+        DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-2003"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
+        ;;
     7.7)
         DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.7.1908"}
         DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1907"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
         ;;
     7.6)
         DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.6.1810"}
         DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1811"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
         ;;
     7.5)
         DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.5.1804"}
         DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1805"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
         ;;
     7.4)
         DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.4.1708"}
         DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1708"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
         ;;
     7.3)
         DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.3.1611"}
         DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1611"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
         ;;
     7.2)
         DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.2.1511"}
         DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1511"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
         ;;
     7.1)
         DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.1.1503"}
         DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1503"}
+        DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
         ;;
     *)
         echo "CentOS 7 version \"$DIB_CENTOS7_VERSION\" is not recognised"
@@ -58,5 +77,5 @@ else
 fi
 
 export DIB_CENTOS7_MIRROR=${DIB_CENTOS7_MIRROR:-"http://vault.centos.org"}
-export DIB_CENTOS7_CLOUDIMAGE_FILE=${DIB_CENTOS7_CLOUDIMAGE_FILE:-CentOS-7-${ARCH}-${DIB_CENTOS7_CLOUDIMAGE_VERSION}.qcow2.xz}
+export DIB_CENTOS7_CLOUDIMAGE_FILE=${DIB_CENTOS7_CLOUDIMAGE_FILE:-CentOS-7-${ARCH}-${DIB_CENTOS7_CLOUDIMAGE_VERSION}.${DIB_CENTOS7_CLOUDIMAGE_EXT}}
 export DIB_CENTOS7_CLOUDIMAGE=${DIB_CENTOS7_CLOUDIMAGE:-${DIB_CENTOS7_CLOUDIMAGE_REPO}/${DIB_CENTOS7_CLOUDIMAGE_FILE}}