Merge lp:~julian-edwards/maas/1.4-enable-arm-again into lp:maas/1.4

[Julian Edwards]

Backport trunk r1719: Fix armhf kernel downloading and ephemeral usage for the post-quantal era where the highbank subarch is now just generic.

[Julian Edwards (julian-edwards)]

Self-approving straight backport.

review: Approve

=== modified file 'etc/maas/import_pxe_files'
--- etc/maas/import_pxe_files	2013-10-09 15:23:58 +0000
+++ etc/maas/import_pxe_files	2013-10-24 17:40:47 +0000
@@ -13,6 +13,6 @@
 
 
 #RELEASES="precise quantal raring saucy"
-#ARCHES="amd64/generic i386/generic armhf/highbank"
+#ARCHES="amd64/generic i386/generic armhf/highbank armhf/generic"
 #LOCALE="en_US"
 #IMPORT_EPHEMERALS=1

=== modified file 'etc/maas/templates/pxe/config.commissioning.armhf.template'
--- etc/maas/templates/pxe/config.commissioning.armhf.template	2013-06-03 11:32:28 +0000
+++ etc/maas/templates/pxe/config.commissioning.armhf.template	2013-10-24 17:40:47 +0000
@@ -1,7 +1,12 @@
 DEFAULT execute
 
 LABEL execute
-  {{py: # SAY is not implemented in U-Boot }}
+  {{# SAY is not implemented in U-Boot }}
+  {{if kernel_params.release not in ("precise", "quantal")}}
+    {{# Return a copy of kernel_params with an overridden subarch.
+        See https://bugs.launchpad.net/maas/+bug/1166994 }}
+    {{py: kernel_params=kernel_params(subarch="generic")}}
+  {{endif}}
   KERNEL {{kernel_params | kernel_path }}
   INITRD {{kernel_params | initrd_path }}
   APPEND {{kernel_params | kernel_command}}

=== modified file 'etc/maas/templates/pxe/config.install.armhf.template'
--- etc/maas/templates/pxe/config.install.armhf.template	2013-06-03 11:32:28 +0000
+++ etc/maas/templates/pxe/config.install.armhf.template	2013-10-24 17:40:47 +0000
@@ -1,7 +1,12 @@
 DEFAULT execute
 
 LABEL execute
-  {{py: # SAY is not implemented in U-Boot }}
+  {{# SAY is not implemented in U-Boot }}
+  {{if kernel_params.release not in ("precise", "quantal")}}
+    {{# Return a copy of kernel_params with an overridden subarch.
+        See https://bugs.launchpad.net/maas/+bug/1166994 }}
+    {{py: kernel_params=kernel_params(subarch="generic")}}
+  {{endif}}
   KERNEL {{kernel_params | kernel_path }}
   INITRD {{kernel_params | initrd_path }}
   APPEND {{kernel_params | kernel_command}}

=== modified file 'scripts/maas-import-pxe-files'
--- scripts/maas-import-pxe-files	2013-10-03 13:53:44 +0000
+++ scripts/maas-import-pxe-files	2013-10-24 17:40:47 +0000
@@ -39,10 +39,7 @@
 STABLE_RELEASE=$(distro-info --stable)
 
 # Supported architectures.
-# armhf/highbank is also supported by this script, but cannot be enabled here
-# until maas-import-ephemerals also supports it or IMPORT_EPHEMERALS is set to
-# 0.
-ARCHES=${ARCHES:-amd64/generic i386/generic armhf/highbank}
+ARCHES=${ARCHES:-amd64/generic i386/generic armhf/highbank armhf/generic}
 
 # Command line to download a resource at a given URL into the current
 # directory.  A wget command line will work here, but curl will do as well.
@@ -191,7 +188,7 @@
         amd64/*|i386/*)
             echo "linux initrd.gz"
             ;;
-        armhf/highbank)
+        armhf/*)
             echo "vmlinuz initrd.gz"
             ;;
         *)
@@ -211,7 +208,7 @@
         amd64/*|i386/*)
             # do nothing
             ;;
-        armhf/highbank)
+        armhf/*)
             mv vmlinuz linux
             ;;
         *)

=== modified file 'src/provisioningserver/pxe/tests/test_config.py'
--- src/provisioningserver/pxe/tests/test_config.py	2013-10-07 09:12:40 +0000
+++ src/provisioningserver/pxe/tests/test_config.py	2013-10-24 17:40:47 +0000
@@ -234,6 +234,45 @@
         self.assertNotIn("LOCALBOOT", output)
 
 
+class TestRenderArmhfSubarchScenarios(MAASTestCase):
+    """See bug https://bugs.launchpad.net/maas/+bug/1166994"""
+
+    scenarios = [
+        ("install_precise", dict(
+            arch="armhf", purpose="install", release="precise",
+            expect_in_output="highbank")),
+        ("install_quantal", dict(
+            arch="armhf", purpose="install", release="quantal",
+            expect_in_output="highbank")),
+        ("install_saucy", dict(
+            arch="armhf", purpose="install", release="saucy",
+            expect_in_output="generic")),
+        ("commission_precise", dict(
+            arch="armhf", purpose="commissioning", release="precise",
+            expect_in_output="highbank")),
+        ("commission_quantal", dict(
+            arch="armhf", purpose="commissioning", release="quantal",
+            expect_in_output="highbank")),
+        ("commission_saucy", dict(
+            arch="armhf", purpose="commissioning", release="saucy",
+            expect_in_output="generic")),
+    ]
+
+    def test_highbank_scenarios(self):
+        # get_ephemeral_name depends on ephemeral images being present but
+        # doesn't affect the test outcome, so patch it out.
+        self.patch(
+            kernel_opts,
+            "get_ephemeral_name").return_value = "ephemeral_name"
+        options = {
+            "kernel_params": make_kernel_parameters(
+                arch=self.arch, purpose=self.purpose, subarch="highbank",
+                release=self.release),
+        }
+        output = render_pxe_config(**options)
+        self.assertIn(self.expect_in_output, output)
+
+
 class TestRenderPXEConfigScenarios(MAASTestCase):
     """Tests for `provisioningserver.pxe.config.render_pxe_config`."""