Merge lp:~smoser/simplestreams/trunk.fix-bionic-tools into lp:simplestreams

[Scott Moser]

Fix ubuntu_versions.py with distro_info > 0.14.

The 'hack_all' nature of 'hack_all' variable name showed itself.
We had been accessing '_rows'. That is now '_releases' and
the content there is no longer a dictionary but rather a
DistroRelease object.

The reason we have to do this at all is to get at the datetime
object for 'eol'. Without that, all we can do is provide a date
and check if a release is supported as of that date. What we want
is to publish the EOL date (in YYYY-MM-DD format).

This change was present in distro_info at 0.15. Artful had 0.17,
bionic has 0.18. Apparently we just didn't notice until now.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:457
https://jenkins.ubuntu.com/server/job/simplestreams-ci/49/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/49
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-arm64/49
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/49
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/49

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/49/rebuild

review: Approve (continuous-integration)

[lp:~smoser/simplestreams/trunk.fix-bionic-tools]

458. By Scott Moser on 2018-02-16

merge from trunk

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:458
https://jenkins.ubuntu.com/server/job/simplestreams-ci/51/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/51
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-arm64/51
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/51
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/51

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/51/rebuild

review: Approve (continuous-integration)

[Dan Watkins (oddbloke)]

review: Approve

=== modified file 'tools/ubuntu_versions.py'
--- tools/ubuntu_versions.py	2017-04-25 19:43:47 +0000
+++ tools/ubuntu_versions.py	2018-02-16 19:19:17 +0000
@@ -105,9 +105,18 @@
     ret = []
 
     # hack_all, because we're using '_rows', which is not supported
-    # however it is the only real way to get at EOL, and is convenient
-    # series there is codename to us
-    hack_all = {i['series']: i for i in udi._rows}
+    # however it is the only real way to get at EOL, which we need.
+    # 'series' there is our 'codename'
+    if hasattr(udi, '_rows'):
+        hack_all = {i['series']: i for i in udi._rows}
+    else:
+        # in bionic versions of distro-info, _rows was replaced with
+        # _releases which is a DistroRelease object rather than a dictionary.
+        fields = ('version', 'codename', 'series', 'created', 'release',
+                  'eol', 'eol_server')
+        hack_all = {drel.series: {k: getattr(drel, k) for k in fields}
+                    for drel in udi._releases}
+
     for i, codename in enumerate(codenames):
         title = "%s LTS" % versions[i] if lts[i] else versions[i]
         eol = hack_all[codename]['eol'].strftime("%Y-%m-%d")