Merge lp:~rcj/vmbuilder/ec2-finder into lp:~ubuntu-on-ec2/vmbuilder/ec2-finder

[Robert C Jennings]

[Jose L. VG (josvaz)]

LGTM!

review: Approve

[Dan Watkins (oddbloke)]

review: Approve

[lp:~rcj/vmbuilder/ec2-finder]

25. By Dan Watkins on 2016-11-07

Remove listings for unsupported releases (LP: #1637798)

=== modified file 'gen-table.sh'
--- gen-table.sh	2016-10-17 21:26:24 +0000
+++ gen-table.sh	2016-11-06 21:03:51 +0000
@@ -7,24 +7,12 @@
 
 suite2version() {
     case $1 in
-        karmic)      echo "9.10 EOL";;
-        hardy)       echo "8.04 LTS";;
-        lucid)       echo "10.04 LTS";;
-        maverick)    echo "10.10 EOL";;
-        natty)       echo "11.04 EOL";;
-        oneiric)     echo "11.10 EOL";;
         precise)     echo "12.04 LTS";;
-        quantal)     echo "12.10 EOL";;
-        raring)      echo "13.04 EOL";;
-        saucy)       echo "13.10 EOL";;
         trusty)      echo "14.04 LTS";;
-        utopic)      echo "14.10 EOL";;
-        vivid)       echo "15.04 EOL";;
-        wily)        echo "15.10 EOL";;
         xenial)      echo "16.04 LTS";;
         yakkety)     echo "16.10";;
         zesty)       echo "17.04";;
-        *) echo "Devel";;
+        *)           echo "unsupported";;
     esac
 }
 
@@ -33,6 +21,9 @@
     while read suite stream tag serial itype arch region ami aki virttype
     do
         version=$(suite2version ${suite})
+        if [ "${version}" == "unsupported" ]; then
+            continue
+        fi
         [ "${aki}" == "hvm" ] && itype="hvm:${itype}"
 
         console="console.aws.amazon.com"