Merge lp:~bigkevmcd/offspring/offspring-master-armhf into lp:offspring

[Kevin McDermott]

This adds support for building armhf projects on armv7l builders.

[Cody A.W. Somerville (cody-somerville)]

review: Approve

[Cody A.W. Somerville (cody-somerville)]

Food for future thought: Is there a way we can more generically test the arch to machine_type relation in dispatch code? Having a test per arch seems of dubious value.

[Kevin McDermott (bigkevmcd)]

Yip...we could split the project.arch -> builder arch lookup out into something like get_builder_arches_for_project, and then test that we can translate for the various project.arch values that they get translated to something appropriate.

It's called refactoring ;-)

=== modified file 'lib/offspring/master/master.py'
--- lib/offspring/master/master.py	2011-11-17 11:58:02 +0000
+++ lib/offspring/master/master.py	2012-03-01 16:50:23 +0000
@@ -157,6 +157,7 @@
                 u"lpia": [u"i386", u"i686", u"x86_64"],
                 u"amd64": [u"x86_64"],
                 u"armel": [u"armv7l"],
+                u"armhf": [u"armv7l"],
         }
         build_requests = self.db_store.find(BuildRequest).order_by(
             Desc(BuildRequest.score))

=== modified file 'lib/offspring/master/tests/test_master.py'
--- lib/offspring/master/tests/test_master.py	2011-11-30 11:42:08 +0000
+++ lib/offspring/master/tests/test_master.py	2012-03-01 16:50:23 +0000
@@ -26,7 +26,7 @@
         return LexbuilderMaster(self.config, self.db_store,
                                 mailer=self.mailer.mail)
 
-    def create_builder(self, current_state=Slave.STATE_IDLE):
+    def create_builder(self, current_state=Slave.STATE_IDLE, arch=None):
         """
         Create and add a Lexbuilder to the store.
         """
@@ -36,7 +36,7 @@
         builder.current_state = current_state
         builder.is_active = True
         builder.is_okay = True
-        builder.machine_type = self.project.arch
+        builder.machine_type = arch or self.project.arch
         self.db_store.add(builder)
         return builder
 
@@ -322,3 +322,37 @@
             {"name": self.project.name, "priority": self.project.priority,
              "builder": builder.name},
             log_file.getvalue())
+
+    def test_dispatch_to_armhf_builder(self):
+        """
+        If a project requires an armhf build, we should dispatch to armv7l
+        builders.
+        """
+        log_file = self.capture_logging(log_level=logging.DEBUG)
+        builder1 = self.create_builder(arch=u"armv7l")
+        builder2 = self.create_builder(arch=u"i386")
+        self.project.arch = u"armhf"
+
+        build_request = self.create_build_request()
+        build_result = BuildResult(build_request, builder1)
+        build_result.name = u"20111115-testing"
+        self.db_store.add(build_result)
+
+        builder1.current_job_id = build_result.id
+
+        builder_mock = self.mocker.patch(builder1)
+        builder_mock.build(ANY)
+        self.mocker.result(builder1.current_job)
+
+        master = self.get_master()
+        self.mocker.replay()
+
+        master.dispatchBuilds()
+
+        self.assertEqual(
+            "Starting up offspring master\n"
+            "Project %(name)s needs building (priority: %(priority)d).\n"
+            "%(name)s has been dispatched to %(builder)s\n" % {
+                "name": self.project.name, "priority": self.project.priority,
+                "builder": builder1.name},
+            log_file.getvalue())