Merge lp:~vila/uci-engine/1331989-homeless into lp:uci-engine

[Vincent Ladeuil]

Fallback to current dir (/srv/<service>) if HOME is not set for the test runner worker.

This fixes http://pad.lv/1331989 caused by:
1) the worker running without HOME being set,
2) the lack of test covering such issues

The test lacks a way to process a rabbit queue.

But it's enough to debug such issues in the mean time.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:603
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/902/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/902/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Approve.

This is going to hit some merge conflicts with some additional refactoring that went into juju_run. But nothing serious. If I get a few spare cycles, I'll look into this and will paste in an MP if I get it solved.

review: Approve

[Francis Ginther (fginther)]

I made a merge to trunk here:
https://code.launchpad.net/~fginther/uci-engine/1331989-homeless-merge-trunk

not sure if it helps much.

[lp:~vila/uci-engine/1331989-homeless]

604. By Vincent Ladeuil on 2014-06-24

Merge trunk, resolving conflicts

605. By Vincent Ladeuil on 2014-06-24

Better document juju_run constraints.

606. By Vincent Ladeuil on 2014-06-24

This is reached when running the integration tests against just a juju bootstrapped node.

=== modified file 'test_runner/tstrun/run_worker.py'
--- test_runner/tstrun/run_worker.py	2014-06-16 13:18:53 +0000
+++ test_runner/tstrun/run_worker.py	2014-06-24 10:47:47 +0000
@@ -38,6 +38,9 @@
         super(TestRunnerWorker, self).__init__('image_test')
         self.data_store_factory = _data_store_factory
         self.data_store = None
+        if os.environ.get('HOME', None) is None:
+            # Fall back to the current dir where the worker is run from
+            os.environ['HOME'] = os.getcwd()
 
     def _create_data_store(self, ticket_id):
         if self.data_store_factory is None:

=== modified file 'test_runner/tstrun/tests/test_testbed.py'
--- test_runner/tstrun/tests/test_testbed.py	2014-06-06 16:50:01 +0000
+++ test_runner/tstrun/tests/test_testbed.py	2014-06-24 10:47:47 +0000
@@ -61,7 +61,7 @@
         # whether canonistack or hpcloud is used.
         if unit_config.is_hpcloud(self.conf.get('os.auth_url')):
             test_images = dict(
-                precise=('Ubuntu Server 12.04.4 LTS (amd64 20140306)'
+                precise=('Ubuntu 12.04.4 LTS (amd64 20140613)'
                          ' - CI Engineering'),
                 saucy=('Ubuntu Server 13.10 (amd64 20131030) - Partner Image'),
             )

=== modified file 'test_runner/tstrun/tests/test_worker.py'
--- test_runner/tstrun/tests/test_worker.py	2014-06-11 13:05:04 +0000
+++ test_runner/tstrun/tests/test_worker.py	2014-06-24 10:47:47 +0000
@@ -68,7 +68,7 @@
                       #            '-amd64-server-20140428-disk1.img'),
                       # For hpcloud:
                       series='precise',
-                      image_id=('Ubuntu Server 12.04.4 LTS (amd64 20140306)'
+                      image_id=('Ubuntu 12.04.4 LTS (amd64 20140613)'
                                 ' - CI Engineering'),
                       package_list=['libpng'])
         self.queue.publish(params)

=== modified file 'tests/deployers.py'
--- tests/deployers.py	2014-06-23 19:41:51 +0000
+++ tests/deployers.py	2014-06-24 10:47:47 +0000
@@ -12,6 +12,8 @@
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 import collections
 import errno
 import os
@@ -43,20 +45,30 @@
         p = subprocess.Popen(
             args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     except OSError as e:
+        # MISSINGTEST: not covered by any test -- vila 2014-06-20
         if e.errno != errno.ENOENT:
             raise
         raise OSError("juju not found, do you have Juju installed?")
     out, err = p.communicate()
     if p.returncode:
-        raise IOError(
-            'juju command failed {!r}:\n{}'.format(juju_args, err))
+        raise IOError('juju command failed {!r}:\n{}'.format(juju_args, err))
     return out
 
 
-def juju_run(service, unit=0, args=''):
-    unit = '{}/{}'.format(service, unit)
-    juju_args = ['run', '--unit', unit, args]
-    return _juju_call(juju_args)
+def juju_run(service, cmd, unit=0):
+    """Call a command on a single given unit.
+
+    :param service: A service name.
+
+    :param cmd: The command to execute on a unit. This should be provided as a
+        string to avoid evaluation on the originating host (the evaluation will
+        happen on the unit itself if needed).
+
+    :param unit: The unit number where the command should be run. It defaults
+        to 0 if not provided.
+
+    """
+    return _juju_call(['run', '--unit', '{}/{}'.format(service, unit), cmd])
 
 
 def juju_expose(service, expose=True):
@@ -64,8 +76,7 @@
         action = 'expose'
     else:
         action = 'unexpose'
-    juju_args = [action, service]
-    return _juju_call(juju_args)
+    return _juju_call([action, service])
 
 
 # TODO ev 2014-06-16 @features.requires(features.settled_units)
@@ -82,9 +93,9 @@
         return ip, int(port)
 
     def assert_job_running(self, service, unit=0, upstart_job=None):
-        '''ensure the given upstart job is running on a unit'''
+        # Ensure the given upstart job is running on a unit
         if upstart_job is None:
             upstart_job = service
-        cmd = '/sbin/status {}'.format(upstart_job)
-        output = juju_run(service, unit, cmd)
+        output = juju_run(service, '/sbin/status {}'.format(upstart_job),
+                          unit=unit)
         self.assertIn('start/running', output)

=== modified file 'tests/test_rabbit.py'
--- tests/test_rabbit.py	2014-06-19 18:10:38 +0000
+++ tests/test_rabbit.py	2014-06-24 10:47:47 +0000
@@ -46,9 +46,8 @@
         fixtures.patch(self, amqp_utils, 'get_config', AmqpConfig)
 
     def run_ctl_cmd(self, args):
-        cmd = ' '.join(args)
-        cmd = 'sudo rabbitmqctl {}'.format(cmd)
-        deployers.juju_run(RABBIT_SERVICE, args=cmd)
+        deployers.juju_run(RABBIT_SERVICE,
+                           'sudo rabbitmqctl {}'.format(' '.join(args)))
 
     def create_user(self, user_name, password=None):
         if password is None:

=== modified file 'tests/test_test_runner.py'
--- tests/test_test_runner.py	2014-06-23 19:41:51 +0000
+++ tests/test_test_runner.py	2014-06-24 10:47:47 +0000
@@ -14,11 +14,36 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import json
 import unittest
+
+
+from ci_utils import amqp_utils
+import deploy
 import deployers
-
-
-class TestTestRunner(deployers.DeployerTest):
+from ucitests import fixtures
+
+
+RABBIT_SERVICE = 'ci-airline-rabbit'
+
+
+def run_rabbit_cmd(args):
+    deployers.juju_run(RABBIT_SERVICE,
+                       'sudo rabbitmqctl {}'.format(' '.join(args)))
+
+
+def create_rabbit_user(user_name, password=None):
+    if password is None:
+        password = user_name
+    run_rabbit_cmd(['add_user', user_name, password])
+    run_rabbit_cmd(['set_permissions', '-p', '/', user_name, '".*" ".*" ".*"'])
+
+
+def delete_rabbit_user(user_name):
+    run_rabbit_cmd(['delete_user', user_name])
+
+
+class SmokeTestTestRunner(deployers.DeployerTest):
     """Integration tests for test runner service run on a juju deployment"""
 
     def test_worker_running(self):
@@ -28,5 +53,51 @@
         self.assert_job_running('ci-airline-tr-rabbit-worker')
 
 
+class TestTestRunner(deployers.DeployerTest):
+
+    def setUp(self):
+        super(TestTestRunner, self).setUp()
+        status = deploy.juju_status()
+        units =  status['services']['ci-airline-rabbit']['units']
+        self.unit = 'ci-airline-rabbit/0'
+        self.public_ip = units[self.unit]['public-address']
+
+        class AmqpConfig(object):
+
+            def __init__(inner):
+                inner.AMQP_HOST = self.public_ip
+                inner.AMQP_VHOST = '/'
+                inner.AMQP_USER = 'tester'
+                inner.AMQP_PASSWORD = 's3cr3t'
+        fixtures.patch(self, amqp_utils, 'get_config', AmqpConfig)
+        create_rabbit_user('tester', 's3cr3t')
+        self.addCleanup(delete_rabbit_user, 'tester')
+
+    def test_process_ticket(self):
+        params = dict(ticket_id='t1', progress_trigger='test-progress',
+                      # For canonistack:
+                      #  image_id=('ubuntu-released/ubuntu-precise-12.04'
+                      #            '-amd64-server-20140428-disk1.img'),
+                      # For hpcloud:
+                      series='precise',
+                      image_id=('Ubuntu 12.04.4 LTS (amd64 20140613)'
+                                ' - CI Engineering'),
+                      package_list=['libpng'])
+        # FIXME: We can't delete that queue with rabbitmqctl, we need the
+        # channel for that which is not exposed -- vila 2014-06-19
+        # self.addCleanup(delete_queue 'test-progress')
+        amqp_utils.send(amqp_utils.TEST_RUNNER_QUEUE, json.dumps(params),
+                        raise_errors=True)
+        # FIXME: From there, the test runner worker receives the message,
+        # process it, send progress to the 'test-progress' queue (all checked
+        # manually by adding 'import pdb; pdb.set_trace() HERE and checking
+        # that uci-vms.conf was properly created on the worker). But we we need
+        # a way to subscribe to that 'test-progress' queue and process the
+        # received messages (and not hang like _run_forever()). That will
+        # provide a way to wait for the ticket to be processed without
+        # involving time.sleep(). Out-of-scope to fix http://pad.lv/1331989, so
+        # punting for now -- vila 2014-06-19
+
+
 if __name__ == "__main__":
     unittest.main()