Merge lp:~sinzui/juju-ci-tools/run-instance-with-series into lp:juju-ci-tools

[Curtis Hovey]

Create manual instances that match the series under test.

substrate.run_instances() only makes precise instances. The get_ami() is always passed "precise". This branch adds a series argument to run_instances(). There was only one call site, so I chose to make this a required argument. All the caller may have been given a series of None, we require a guard to assume precise. While every caller of boot_context should be passing series, we really don't know if every caller is explicitly passing series as they should.

[Martin Packman (gz)]

Looks good!

review: Approve

=== modified file 'deploy_stack.py'
--- deploy_stack.py	2015-08-25 20:58:39 +0000
+++ deploy_stack.py	2015-09-15 20:29:47 +0000
@@ -408,7 +408,7 @@
     running_domains = dict()
     try:
         if client.env.config['type'] == 'manual' and bootstrap_host is None:
-            instances = run_instances(3, temp_env_name)
+            instances = run_instances(3, temp_env_name, series)
             created_machines = True
             bootstrap_host = instances[0][1]
             machines.extend(i[1] for i in instances[1:])

=== modified file 'substrate.py'
--- substrate.py	2015-07-02 00:59:47 +0000
+++ substrate.py	2015-09-15 20:29:47 +0000
@@ -543,9 +543,18 @@
         yield fields[1], fields[3]
 
 
-def run_instances(count, job_name):
+def run_instances(count, job_name, series):
+    """create a number of instances in ec2 and tag them.
+
+    :param count: The number of instances to create.
+    :param job_name: The name of job that owns the instances (used as a tag).
+    :param series: The series to run in the instance.
+        If None, Precise will be used.
+    """
+    if series is None:
+        series = 'precise'
     environ = dict(os.environ)
-    ami = get_ami.query_ami("precise", "amd64")
+    ami = get_ami.query_ami(series, "amd64")
     command = [
         'euca-run-instances', '-k', 'id_rsa', '-n', '%d' % count,
         '-t', 'm1.large', '-g', 'manual-juju-test', ami]

=== modified file 'test_substrate.py'
--- test_substrate.py	2015-06-12 18:54:52 +0000
+++ test_substrate.py	2015-09-15 20:29:47 +0000
@@ -852,7 +852,7 @@
         self.assertEqual(
             [('i-foo', 'bar-0'), ('i-baz', 'bar-1')], [d for d in description])
 
-    def test_run_instances(self):
+    def test_run_instances_without_series(self):
         euca_data = dedent("""
             header
             INSTANCE\ti-foo\tblah\tbar-0
@@ -867,7 +867,7 @@
                            return_value=description, autospec=True) as di_mock:
                     with patch('get_ami.query_ami',
                                return_value=ami, autospec=True) as qa_mock:
-                        run_instances(2, 'qux')
+                        run_instances(2, 'qux', None)
         co_mock.assert_called_once_with(
             ['euca-run-instances', '-k', 'id_rsa', '-n', '2',
              '-t', 'm1.large', '-g', 'manual-juju-test', ami],
@@ -878,6 +878,22 @@
         di_mock.assert_called_once_with(['i-foo', 'i-baz'], env=os.environ)
         qa_mock.assert_called_once_with('precise', 'amd64')
 
+    @patch('get_ami.query_ami', autospec=True)
+    @patch('substrate.describe_instances', autospec=True)
+    @patch('subprocess.check_call', autospec=True)
+    @patch('subprocess.check_output', autospec=True)
+    def test_run_instances_with_series(self,
+                                       co_mock, cc_mock, di_mock, qa_mock):
+        co_mock.return_value = dedent("""
+            header
+            INSTANCE\ti-foo\tblah\tbar-0
+            INSTANCE\ti-baz\tblah\tbar-1
+            """)
+        di_mock.return_value = [('i-foo', 'bar-0'), ('i-baz', 'bar-1')]
+        qa_mock.return_value = "ami-atest"
+        run_instances(2, 'qux', 'wily')
+        qa_mock.assert_called_once_with('wily', 'amd64')
+
     def test_run_instances_tagging_failed(self):
         euca_data = 'INSTANCE\ti-foo\tblah\tbar-0'
         description = [('i-foo', 'bar-0')]
@@ -889,7 +905,7 @@
                            return_value=description, autospec=True):
                     with patch('subprocess.call', autospec=True) as c_mock:
                         with self.assertRaises(CalledProcessError):
-                            run_instances(1, 'qux')
+                            run_instances(1, 'qux', 'trusty')
         c_mock.assert_called_with(['euca-terminate-instances', 'i-foo'])
 
     def test_run_instances_describe_failed(self):
@@ -900,7 +916,7 @@
                        side_effect=CalledProcessError('', '')):
                 with patch('subprocess.call', autospec=True) as c_mock:
                     with self.assertRaises(CalledProcessError):
-                        run_instances(1, 'qux')
+                        run_instances(1, 'qux', 'trusty')
         c_mock.assert_called_with(['euca-terminate-instances', 'i-foo'])
 
     def test_destroy_job_instances_none(self):