Merge lp:~ltrager/maas-images/xenial_ppc_bootloader into lp:maas-images

[Lee Trager]

Revert Open Firmware PPC64EL bootloader to Xenial.

The Bionic bootloader for Open Firmware PPC64EL is requesting a GRUB
configuration file for the wrong MAC address(LP:1785859). Until this
bug is fixed revert to the Xenial bootloader.

To allow the bootloader to be reverted lp:maas-images will now only look to see if the bootloader discovered in the archive differs from the latest
bootloader in the stream. Older bootloaders in the stream are ignored. This allows the release for each bootloader to be reverted to an older version or upgraded to a newer version without changing anything other than bootloaders.yaml.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'conf/bootloaders.yaml'
--- conf/bootloaders.yaml	2018-07-19 03:21:42 +0000
+++ conf/bootloaders.yaml	2018-08-07 21:41:25 +0000
@@ -54,7 +54,7 @@
    arch: ppc64el
    arches: ppc64el,ppc64
    archive: http://ports.ubuntu.com
-   release: bionic
+   release: xenial
    os: grub-ieee1275
    files:
     - usr/lib/grub/powerpc-ieee1275/

=== modified file 'meph2/commands/mimport.py'
--- meph2/commands/mimport.py	2018-04-18 21:25:35 +0000
+++ meph2/commands/mimport.py	2018-08-07 21:41:25 +0000
@@ -112,15 +112,17 @@
         # the packages in the archive
         if product_id in product_tree['products']:
             versions = product_tree['products'][product_id]['versions']
-            for data in versions.values():
-                for item in data['items'].values():
-                    src_package = src_packages.get(item['src_package'])
-                    if (
-                            src_package is not None and
-                            src_package['src_version'] == item['src_version']
-                            and
-                            src_package['src_release'] == item['src_release']):
-                        src_packages[item['src_package']]['found'] = True
+            # Only check if the latest version in the stream matches the
+            # latest version from the archive. This allows bootloaders to
+            # be reverted to previous versions.
+            data = versions[max(versions.keys())]
+            for item in data['items'].values():
+                src_package = src_packages.get(item['src_package'])
+                if (
+                        src_package is not None and
+                        src_package['src_version'] == item['src_version'] and
+                        src_package['src_release'] == item['src_release']):
+                    src_packages[item['src_package']]['found'] = True
         bootloader_uptodate = True
         for src_package in src_packages.values():
             if not src_package['found']: