Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-philroche-trusty-supported into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Philip Roche]

Add Trusty to list of supported releases in ubuntu lists

Add Trusty to list of supported releases in ubuntu lists

[Robert C Jennings (rcj)]

review: Approve

[Cody Shepherd (codyshepherd)]

review: Approve

=== modified file 'generate-ubuntu-lists.sh'
--- generate-ubuntu-lists.sh	2015-11-05 22:18:14 +0000
+++ generate-ubuntu-lists.sh	2019-05-01 18:03:23 +0000
@@ -19,8 +19,11 @@
 ubuntu-distro-info --release --supported \
     > ${tmpd}/ubuntu-versions.txt
 
+ubuntu-distro-info --supported-esm \
+    > ${tmpd}/ubuntu-supported-esm.txt
+
 # Populate releases which may be missing
-for suite in vivid:15.04 wily:15.10 xenial:16.04;
+for suite in trusty:14.04 xenial:16.04;
 do
     echo "${suite%%:*}" >> ${tmpd}/ubuntu-supported.txt
     echo "${suite%%:*}" >> ${tmpd}/ubuntu-all.txt
@@ -42,3 +45,6 @@
 
 sort -r -u ${tmpd}/ubuntu-unsupported.txt \
     > ${final_d}/ubuntu-unsupported.txt
+
+sort -r -u ${tmpd}/ubuntu-unsupported-esm.txt \
+    > ${final_d}/ubuntu-unsupported-esm.txt