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

[Lee Trager]

Support building a specific revision of CentOS with a specific release.

revision and release may now be defined in centos.yaml. When revision is
defined only upstream builds with a matching revision will be built. A
release may also be specified to allow revisions to be rebuilt.

[lp:~ltrager/maas-images/centos_version]

407. By Lee Trager on 2018-09-18

Fix tox

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'conf/centos.yaml'
--- conf/centos.yaml	2018-09-18 13:44:35 +0000
+++ conf/centos.yaml	2018-09-18 13:44:35 +0000
@@ -11,6 +11,12 @@
         path_version: 7
         release_title: "CentOS 7.0"
         curtin_files: "{curtin_path}/centos7"
+        # The upstream revision to create MAAS images for. All other versions
+        # are ignored if this is defined.
+        revision: 1808
+        # The lp:maas-images release. This defaults to 01. Changing this will
+        # cause a new build of the revision to be imported.
+        release: 02
         packages:
          # cloud-init depends on packages from EPEL
          - epel-release
@@ -46,6 +52,12 @@
         version: 6.6
         release_title: "CentOS 6.6"
         curtin_files: "{curtin_path}/centos6"
+        # The upstream revision to create MAAS images for. All other versions
+        # are ignored if this is defined.
+        revision: 1808
+        # The lp:maas-images release. This defaults to 01. Changing this will
+        # cause a new build of the revision to be imported.
+        release: 02
         packages:
          # cloud-init depends on packages from EPEL
          - epel-release

=== modified file 'meph2/commands/mimport.py'
--- meph2/commands/mimport.py	2018-09-18 13:44:35 +0000
+++ meph2/commands/mimport.py	2018-09-18 13:44:35 +0000
@@ -42,13 +42,21 @@
         else:
             raise ValueError("Undefined remote path")
 
-        images = OrderedDict()
-        if args.max == 0:
-            max_items = len(images_unordered)
+        revision = release_info.get('revision')
+        if revision:
+            revision = str(revision)
+            if revision not in images_unordered:
+                raise ValueError('Revision %s does not exist!' % revision)
+            images = {revision: images_unordered[revision]}
         else:
-            max_items = args.max
-        for key in sorted(images_unordered.keys(), reverse=True)[:max_items]:
-            images[key] = images_unordered[key]
+            images = OrderedDict()
+            if args.max == 0:
+                max_items = len(images_unordered)
+            else:
+                max_items = args.max
+            for key in sorted(
+                    images_unordered.keys(), reverse=True)[:max_items]:
+                images[key] = images_unordered[key]
 
         base_url = os.path.dirname(url)
 
@@ -66,7 +74,8 @@
             }
 
         for (revision, image_info) in images.items():
-            version = '20%s01_%02d' % (revision, image_info['release'])
+            version = '20%s01_%02d' % (
+                revision, release_info.get('release', image_info['release']))
             if (
                     product_id in product_tree['products'] and
                     version in product_tree['products'][product_id][