Merge lp:~jtv/maas-test/no-import-ephemerals into lp:maas-test

[Jeroen T. Vermeulen]

Don't run the old maas-import-ephemerals script; it no longer exists.

This should fix current breakage, where the attempt to run the ephemerals import script fails. But an important part is still missing, for which I'd like to file a separate bug: now, it will download the default images (precise/trusty i386/amd64) instead of the specified architecture and series. We still need to write a bootresources.yaml.

It would be possible to leave the old environment variables in, to get at least a semblance of the old architecture/release selections when running against a pre-Trusty version of MAAS. But if we go that way now, we risk losing sight of which variable matters when, and ending up with an unmaintainable hairball of code. Trusty is the new LTS, and I would prefer to say: if you want to run maas-test against pre-Trusty versions of MAAS, use a pre-Trusty version of maas-test.

Jeroen

[Raphaël Badin (rvb)]

> if you want to run maas-test against pre-Trusty versions of MAAS, use a pre-Trusty version of maas-test.

I'm not sure we want to impose that on a user. How about checking for the presence of /etc/maas/bootresources.yaml and do the import the old way if it's not there still?

[Gavin Panella (allenap)]

> > if you want to run maas-test against pre-Trusty versions of MAAS, use a pre-
> Trusty version of maas-test.
>
> I'm not sure we want to impose that on a user. How about checking for the
> presence of /etc/maas/bootresources.yaml and do the import the old way if it's
> not there still?

maas-test is meant for Trusty though. I'm not sure we should even suggest running it on anything before Trusty.

[Julian Edwards (julian-edwards)]

On Thursday 03 Apr 2014 16:10:28 you wrote:
> > > if you want to run maas-test against pre-Trusty versions of MAAS, use a
> > > pre->
> > Trusty version of maas-test.
> >
> > I'm not sure we want to impose that on a user. How about checking for the
> > presence of /etc/maas/bootresources.yaml and do the import the old way if
> > it's not there still?
>
> maas-test is meant for Trusty though. I'm not sure we should even suggest
> running it on anything before Trusty.

Agreed 100%. Please ignore anything other than trusty as released.

[Julian Edwards (julian-edwards)]

Yep please do that extra bug. Thankfully it should be very easy to write the bootresources.yaml!

review: Approve

[Raphaël Badin (rvb)]

> Agreed 100%. Please ignore anything other than trusty as released.

All right. Then you should get rid of the param --simplestreams-filter because this branch effectively removes its effect.

[Raphaël Badin (rvb)]

> Agreed 100%. Please ignore anything other than trusty as released.

Also: bug 1302617.

=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py	2014-03-03 05:34:25 +0000
+++ maastest/maasfixture.py	2014-04-03 02:17:21 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2013-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Manage a MAAS installation."""
@@ -226,42 +226,20 @@
         arch_list = utils.mipf_arch_list(architecture)
         arch_string = ' '.join(arch_list)
         logging.info(
-            "Importing MAAS PXE files series=%s, architectures=%s..." % (
+            "Importing boot images series=%s, architectures=%s..." % (
                 series, arch_string))
         # Import boot images.
+        # XXX jtv 2014-04-03: Configure /etc/maas/bootresources.yaml to import
+        # just the right series & architecture.
         self.kvm_fixture.run_command(
             [
                 'sudo',
-                'RELEASES=%s' % series,
-                'ARCHES=%s' % arch_string,
                 'http_proxy=%s' % self.proxy_url,
                 'https_proxy=%s' % self.proxy_url,
-                'IMPORT_EPHEMERALS=0',
                 'maas-import-pxe-files',
             ],
             check_call=True)
-        # Import ephemerals.  We do this as a second step and not as part of
-        # the 'maas-import-pxe-files' run in case a custom simplestreams
-        # filter is given.
-        # Remove the 'subarch' part from the architecture list because
-        # simplestreams doesn't currently support subarch.
-        arches = [arch.split("/")[0] for arch in arch_list]
-        filters = [
-            utils.compose_filter('arch', arches),
-            'release=%s' % series,
-        ]
-        if simplestreams_filter is not None:
-            filters.append(simplestreams_filter)
-        logging.info("Importing MAAS ephemerals %s..." % ' '.join(filters))
-        self.kvm_fixture.run_command(
-            [
-                'sudo',
-                'http_proxy=%s' % self.proxy_url,
-                'https_proxy=%s' % self.proxy_url,
-                'maas-import-ephemerals',
-            ] + filters,
-            check_call=True)
-        logging.info("Done importing MAAS PXE files and ephemerals.")
+        logging.info("Done importing boot images.")
 
     def configure(self, name, value):
         """Set a config value in MAAS."""

=== modified file 'maastest/tests/test_maasfixture.py'
--- maastest/tests/test_maasfixture.py	2014-03-03 10:09:51 +0000
+++ maastest/tests/test_maasfixture.py	2014-04-03 02:17:21 +0000
@@ -756,24 +756,10 @@
         self.assertEqual(
             mock.call([
                 'sudo',
-                'RELEASES=%s' % series,
-                'ARCHES=%s' % ' '.join(returned_arches),
                 'http_proxy=%s' % proxy_url,
                 'https_proxy=%s' % proxy_url,
-                'IMPORT_EPHEMERALS=0',
                 'maas-import-pxe-files',
             ], check_call=True),
-            kvm_fixture.run_command.mock_calls[-2])
-        self.assertEqual(
-            mock.call([
-                'sudo',
-                'http_proxy=%s' % proxy_url,
-                'https_proxy=%s' % proxy_url,
-                'maas-import-ephemerals',
-                'arch~(' + '|'.join(returned_arches) + ')',
-                'release=%s' % series,
-                filter,
-            ], check_call=True),
             kvm_fixture.run_command.mock_calls[-1])
         self.assertEqual([mock.call(arch)], mock_mipf_arch_list.mock_calls)