Merge lp:~gz/juju-ci-tools/maas_spacelessness into lp:juju-ci-tools

[Martin Packman]

New environment variable to disable use of space constraint

Our 2.0 and 2.1 maas environments are now happy with their spaces, but 1.9 is still upset. Both to get those jobs passing again, and to give us an easy way to disable from the jenkins job in the future, this branch adds a new JUJU_CI_SPACELESSNESS environment variable that can be set globally and will disable the space constraint.

[Martin Packman (gz)]

Forgot to note, setting the environment variable in the test is fine as the class derives from the base TestCase which isolates os.environ already.

[Curtis Hovey (sinzui)]

Thank you

review: Approve (code)

=== modified file 'jujupy.py'
--- jujupy.py	2016-10-24 16:14:59 +0000
+++ jujupy.py	2016-10-24 17:50:39 +0000
@@ -1560,11 +1560,15 @@
         args = e_arg + args
         self.juju('deployer', args, self.env.needs_sudo(), include_e=False)
 
+    @staticmethod
+    def _maas_spaces_enabled():
+        return not os.environ.get("JUJU_CI_SPACELESSNESS")
+
     def _get_substrate_constraints(self):
         if self.env.joyent:
             # Only accept kvm packages by requiring >1 cpu core, see lp:1446264
             return 'mem=2G cpu-cores=1'
-        elif self.env.maas:
+        elif self.env.maas and self._maas_spaces_enabled():
             # For now only maas support spaces in a meaningful way.
             return 'mem=2G spaces={}'.format(','.join(
                 '^' + space for space in sorted(self.excluded_spaces)))

=== modified file 'tests/test_jujupy.py'
--- tests/test_jujupy.py	2016-10-24 16:14:59 +0000
+++ tests/test_jujupy.py	2016-10-24 17:50:39 +0000
@@ -801,6 +801,23 @@
                     '--agent-version', '2.0'),
                 include_e=False)
 
+    def test_bootstrap_maas_spaceless(self):
+        # Disable space constraint with environment variable
+        os.environ['JUJU_CI_SPACELESSNESS'] = "1"
+        env = JujuData('maas', {'type': 'foo', 'region': 'asdf'})
+        with patch.object(EnvJujuClient, 'juju') as mock:
+            client = EnvJujuClient(env, '2.0-zeta1', None)
+            with patch.object(client.env, 'maas', lambda: True):
+                with observable_temp_file() as config_file:
+                    client.bootstrap()
+            mock.assert_called_with(
+                'bootstrap', (
+                    '--constraints', 'mem=2G'
+                    'foo/asdf', 'maas',
+                    '--config', config_file.name, '--default-model', 'maas',
+                    '--agent-version', '2.0'),
+                include_e=False)
+
     def test_bootstrap_joyent(self):
         env = JujuData('joyent', {
             'type': 'joyent', 'sdc-url': 'https://foo.api.joyentcloud.com'})