Merge lp:~jtv/maas-test/fix-streams-url-option into lp:maas-test

[Jeroen T. Vermeulen]

Repeat a last change from my previous branch, replacing the --daily-images option with --image-stream-url; I must have pushed it to the wrong place, or not at all.

This was actually part of the review changes to my last branch, and part of the manual testing, so I'll just self-approve it. Otherwise things are horribly broken.

[Jeroen T. Vermeulen (jtv)]

Yup, all stuff I did before. It works now.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~jtv/maas-test/fix-streams-url-option into lp:maas-test failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Get:1 http://security.ubuntu.com saucy-security Release.gpg [933 B]
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Get:2 http://security.ubuntu.com saucy-security Release [49.6 kB]
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Get:5 http://security.ubuntu.com saucy-security/main Sources [40.2 kB]
Get:6 http://security.ubuntu.com saucy-security/universe Sources [8,834 B]
Get:7 http://security.ubuntu.com saucy-security/main amd64 Packages [108 kB]
Get:8 http://security.ubuntu.com saucy-security/universe amd64 Packages [36.9 kB]
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Get:9 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [81.8 kB]
Get:10 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [68.6 kB]
Get:11 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [225 kB]
Get:12 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [159 kB]
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 829 kB in 0s (2,232 kB/s)
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
cpu-checker is already the newest version.
python-distro-info is already the newest version.
python-fixtures is already the newest version.
python-lxml is already the newest version.
python-mock is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-six is already the newest version.
python-testresources is already the newest version.
python-testtools is already the newest version.
python3-fixtures is already the newest version.
python3-lxml is already the newes...

[lp:~jtv/maas-test/fix-streams-url-option]

153. By Jeroen T. Vermeulen on 2014-04-10

Collateral damage: another test notices the extra parameter.

=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py	2014-04-10 07:32:35 +0000
+++ maastest/maasfixture.py	2014-04-10 10:39:35 +0000
@@ -366,7 +366,8 @@
         # controllers, and so on.
         self.import_maas_images(
             series=self.series, architecture=self.architecture,
-            simplestreams_filter=self.simplestreams_filter)
+            simplestreams_filter=self.simplestreams_filter,
+            image_stream_url=self.image_stream_url)
         self.wait_until_boot_images_scanned()
         self.configure_default_series(self.series)
         if self.kvm_fixture.direct_ip is not None:

=== modified file 'maastest/main.py'
--- maastest/main.py	2014-03-03 04:27:57 +0000
+++ maastest/main.py	2014-04-10 10:39:35 +0000
@@ -259,7 +259,7 @@
     from maastest.maasfixture import MAASFixture
     fixture = MAASFixture(
         machine, proxy_url=proxy_url, series=args.series,
-        architecture=args.architecture,
+        architecture=args.architecture, image_stream_url=args.image_stream_url,
         simplestreams_filter=args.simplestreams_filter)
     fixture.install_maas()
     return fixture

=== modified file 'maastest/parser.py'
--- maastest/parser.py	2014-04-10 07:02:05 +0000
+++ maastest/parser.py	2014-04-10 10:39:35 +0000
@@ -148,8 +148,13 @@
         help="Node's CPU architecture, e.g. armhf/highbank or amd64.  "
              "Defaults to %(default)s.")
     parser.add_argument(
-        '--daily-images', action='store_true',
-        help="Use the \"daily\" boot images stream instead of \"release\".")
+        '--image-stream-url', type=text_type,
+        help="Simplestreams URL where boot images can be downloaded. "
+             "Defaults to the release images at "
+             "http://maas.ubuntu.com/images/ephemeral-v2/releases/ - but "
+             "daily images of released and unreleased versions of Ubuntu "
+             "are available at "
+             "http://maas.ubuntu.com/images/ephemeral-v2/daily/")
 
     # Proxy.
     parser.add_argument(

=== modified file 'maastest/tests/test_maasfixture.py'
--- maastest/tests/test_maasfixture.py	2014-04-10 07:32:35 +0000
+++ maastest/tests/test_maasfixture.py	2014-04-10 10:39:35 +0000
@@ -696,6 +696,7 @@
                 [mock.call(
                     series=maas_fixture.series,
                     architecture=maas_fixture.architecture,
+                    image_stream_url=maas_fixture.image_stream_url,
                     simplestreams_filter=maas_fixture.simplestreams_filter)],
                 [mock.call()],
             ],