Merge lp:~powersj/vmbuilder/jenkins_kvm into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Joshua Powers]

Fix the release, codename, and suite mappings.

The mappings are completely out of date and not correct at all for the last couple LTS. Furthermore, then script used to translate a suite (e.g. focal) to version is not working and even states that it would not work after the Z release.

[Steve Langasek (vorlon)]

Would it be better to use distro-info for this rather than hard coding a mapping that will be perpetually out of date?

[Joshua Powers (powersj)]

Looks like distro-info's "--fullname" gets us what we eventually use:

$ distro-info --series=bionic --fullname
Ubuntu 18.04 LTS "Bionic Beaver"

Except this runs on Jerff with version 0.8 and I do not see the --series flag till version 0.13.

[David Krauser (davidkrauser)]

Seems like a reasonable change, but are we still using this? What do we use it for?

[Joshua Powers (powersj)]

> Seems like a reasonable change, but are we still using this? What do we use it
> for?

https://cloud-images.ubuntu.com/releases/bionic/release/unpacked/release_notes.txt
https://cloud-images.ubuntu.com/releases/focal/release/unpacked/release_notes.txt

[David Krauser (davidkrauser)]

review: Approve

[Robert C Jennings (rcj)]

review: Approve

=== modified file 'jenkins/CloudImages_Base_Release_Delta.sh'
--- jenkins/CloudImages_Base_Release_Delta.sh	2015-12-03 16:42:51 +0000
+++ jenkins/CloudImages_Base_Release_Delta.sh	2020-06-05 17:43:29 +0000
@@ -190,25 +190,39 @@
     sed -e 's,====,,g' -e 's,^, *,g' | sort -k2)
 
 # Generate the email template
-VER=$(${kvm}/ubuntu-adj2version ${SUITE})
-
-case ${VER} in
-    *8.04*)  VER="${VER} LTS";
-             CODENAME="Hardy Heron";;
-    *10.04*) VER="${VER} LTS";
-             CODENAME="Lucid Lynx";;
-    *11.04*) CODENAME="Natty Narwhal";;
-    *11.10*) CODENAME="Oneiric Ocelot";;
-    *12.04*) VER="${VER} LTS";
-             CODENAME="Precise Pangolin";;
-    *12.10*) CODENAME="Quantal Queztal";;
-    *13.04*) CODENAME="Raring Ringtail";;
-    *13.10*) CODENAME="Saucy Salamander";;
-    *14.04*) VER="${VER} LTS";
-             CODENAME="Trusty Tahr";;
-    *14.10*) CODENAME="Utopic Unicorn";;
-    *15.04*) CODENAME="Vivid Vervet";;
-    *15.10*) CODENAME="Wily Werewolf";;
+case ${SUITE} in
+    precise)
+        VER='12.04 LTS'
+        CODENAME='Precise Pangolin'
+        ;;
+    trusty)
+        VER='14.04 LTS'
+        CODENAME='Trusty Tahr'
+        ;;
+    xenial)
+        VER='16.04 LTS'
+        CODENAME='Xenial Xerus'
+        ;;
+    bionic)
+        VER='18.04 LTS'
+        CODENAME='Bionic Beaver'
+        ;;
+    eoan)
+        VER='19.10'
+        CODENAME='Eoan Ermine'
+        ;;
+    focal)
+        VER='20.04 LTS'
+        CODENAME='Focal Fossa'
+        ;;
+    groovy)
+        VER='20.10'
+        CODENAME='Groovy Gorilla'
+        ;;
+    *)
+        echo "Unknown suite: '${SUITE}'" >&2
+        exit 1
+        ;;
 esac
 
 email_name="${WORKSPACE}/${SUITE}-release_announcement.email"