launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/qa-lab-tests-manual into lp:~maas-maintainers/maas/qa-lab-tests.

Commit message:
Deploy mediawiki on ARM unless DO_NOT_USE_ARM_NODES is set.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~rvb/maas/qa-lab-tests-manual/+merge/138677
-- 
https://code.launchpad.net/~rvb/maas/qa-lab-tests-manual/+merge/138677
Your team MAAS Maintainers is requested to review the proposed merge of lp:~rvb/maas/qa-lab-tests-manual into lp:~maas-maintainers/maas/qa-lab-tests.

=== modified file 'maas-integration.py'
--- maas-integration.py	2012-12-06 17:19:30 +0000
+++ maas-integration.py	2012-12-07 10:08:21 +0000
@@ -423,7 +423,11 @@
     def test_16_juju_setup(self):
         # Deploy mediawiki with its mysql db.
         self._run_juju_command(["deploy", "mysql"])
-        self._run_juju_command(["deploy", "mediawiki"])
+        if DO_NOT_USE_ARM_NODES:
+            self._run_juju_command(["deploy", "mediawiki"])
+        else:
+            self._run_juju_command(
+                ["deploy", "mediawiki", "--constraints", "arch=arm"])
         self._run_juju_command(["add-relation", "mediawiki:db", "mysql"])
         self._run_juju_command(["expose", "mediawiki"])
         # Add new unit for test 18: we run that here to