Merge lp:~jog/juju-ci-tools/centos_deploy_stack into lp:juju-ci-tools

[John George]

When deploying centos charms:
1. Set the series for the bootstrap machine back to trusty.
2. Avoid calling assess_juju_run.
3. Add constraints to request appropriate nodes from MAAS.

[Martin Packman (gz)]

Looks good, a few comments inline.

review: Approve

[lp:~jog/juju-ci-tools/centos_deploy_stack]

1126. By John George on 2015-10-21

Adjust mocks and MAAS constraint tag names.

[John George (jog)]

I actually had to assign PCI slots to NICs out of order. It's about MAAS being cabled to the first device that's discovered by CentOS and how those NICs are assigned to the network bridges defined on the hypervisor host machine. Added a 'MAAS_NIC_1' tag to our MAAS 1.8 and 1.9 environments.

I updated skip_juju_run, so it's set by passing a tuple to charm_prefix.startswith()

Adjusted mocks for test_deploy_dummy_stack_sets_centos_constraints()

=== modified file 'deploy_stack.py'
--- deploy_stack.py	2015-09-23 13:30:52 +0000
+++ deploy_stack.py	2015-10-21 17:28:25 +0000
@@ -70,6 +70,10 @@
 def deploy_dummy_stack(client, charm_prefix):
     """"Deploy a dummy stack in the specified environment.
     """
+    # Centos requires specific machine configuration (i.e. network device
+    # order).
+    if charm_prefix.startswith("local:centos") and client.env.maas:
+        client.juju('set-constraints', ('tags=MAAS_NIC_1',))
     client.deploy(charm_prefix + 'dummy-source')
     token = get_random_string()
     client.juju('set', ('dummy-source', 'token=%s' % token))
@@ -339,9 +343,9 @@
     if series is None:
         series = 'precise'
     charm_prefix = 'local:{}/'.format(series)
-    # Don't need windows state server to test windows charms, trusty is faster.
-    if series.startswith("win"):
-        logging.info('Setting default series to trusty for windows deploy.')
+    # Don't need windows or centos state servers.
+    if series.startswith("win") or series.startswith("centos"):
+        logging.info('Setting default series to trusty for win and centos.')
         series = 'trusty'
     return _deploy_job(args.temp_env_name, args.env, args.upgrade,
                        charm_prefix, args.bootstrap_host, args.machine,
@@ -544,12 +548,12 @@
             manager = nested()
         with manager:
             deploy_dummy_stack(client, charm_prefix)
-        is_windows_charm = charm_prefix.startswith("local:win")
-        if not is_windows_charm:
+        skip_juju_run = charm_prefix.startswith(("local:centos", "local:win"))
+        if not skip_juju_run:
             assess_juju_run(client)
         if upgrade:
             client.juju('status', ())
-            assess_upgrade(client, juju_path, skip_juju_run=is_windows_charm)
+            assess_upgrade(client, juju_path, skip_juju_run)
 
 
 def safe_print_status(client):

=== modified file 'tests/test_deploy_stack.py'
--- tests/test_deploy_stack.py	2015-10-14 19:51:57 +0000
+++ tests/test_deploy_stack.py	2015-10-21 17:28:25 +0000
@@ -25,6 +25,7 @@
     copy_local_logs,
     copy_remote_logs,
     deploy_dummy_stack,
+    deploy_job,
     _deploy_job,
     deploy_job_parse_args,
     destroy_environment,
@@ -519,6 +520,20 @@
 
 class TestDeployDummyStack(FakeHomeTestCase):
 
+    @patch('deploy_stack.check_token')
+    def test_deploy_dummy_stack_sets_centos_constraints(self, ct_mock):
+        env = SimpleEnvironment('foo', {'type': 'maas'})
+        client = EnvJujuClient(env, None, '/foo/juju')
+        with patch('subprocess.check_call', autospec=True) as cc_mock:
+            with patch.object(EnvJujuClient, 'wait_for_started'):
+                with patch('deploy_stack.get_random_string',
+                           return_value='fake-token', autospec=True):
+                    deploy_dummy_stack(client, 'local:centos/foo')
+        assert_juju_call(self, cc_mock, client,
+                         ('juju', '--show-log', 'set-constraints', '-e', 'foo',
+                          'tags=MAAS_NIC_1'), 0)
+        self.assertEqual(ct_mock.call_count, 1)
+
     def test_deploy_dummy_stack(self):
         env = SimpleEnvironment('foo', {'type': 'nonlocal'})
         client = EnvJujuClient(env, None, '/foo/juju')
@@ -632,6 +647,36 @@
             'foo', client, None, None, None, None, None, None, None, None,
             permanent=False, region='region-foo')
 
+    def test_deploy_job_changes_series_with_win(self):
+        args = Namespace(
+            series='windows', temp_env_name=None, env=None, upgrade=None,
+            charm_prefix=None, bootstrap_host=None, machine=None, logs=None,
+            debug=None, juju_bin=None, agent_url=None, agent_stream=None,
+            keep_env=None, upload_tools=None, with_chaos=None, jes=None,
+            pre_destroy=None, region=None, verbose=None)
+        with patch('deploy_stack.deploy_job_parse_args', return_value=args,
+                   autospec=True):
+            with patch('deploy_stack._deploy_job', autospec=True) as ds_mock:
+                deploy_job()
+        call_args = ds_mock.call_args[0]
+        self.assertEqual(call_args[3], 'local:windows/')
+        self.assertEqual(call_args[6], 'trusty')
+
+    def test_deploy_job_changes_series_with_centos(self):
+        args = Namespace(
+            series='centos', temp_env_name=None, env=None, upgrade=None,
+            charm_prefix=None, bootstrap_host=None, machine=None, logs=None,
+            debug=None, juju_bin=None, agent_url=None, agent_stream=None,
+            keep_env=None, upload_tools=None, with_chaos=None, jes=None,
+            pre_destroy=None, region=None, verbose=None)
+        with patch('deploy_stack.deploy_job_parse_args', return_value=args,
+                   autospec=True):
+            with patch('deploy_stack._deploy_job', autospec=True) as ds_mock:
+                deploy_job()
+        call_args = ds_mock.call_args[0]
+        self.assertEqual(call_args[3], 'local:centos/')
+        self.assertEqual(call_args[6], 'trusty')
+
 
 class TestTestUpgrade(FakeHomeTestCase):