Merge lp:~cprov/core-image-tester/message-test-branch into lp:core-image-tester

[Celso Providelo]

Recording 'test_branch' and 'test_branch_revno' in the request message. This way we will be able to completely reproduce the testing experience after the testing attempt (up to the deadletter queue).

Recording 'test_branch' and 'test_branch_revno' in the request message. This way we will be able to completely reproduce the testing experience after the testing attempt (up to the deadletter queue).

[Para Siva (psivaa)]

LGTM

review: Approve

[Francis Ginther (fginther)]

I think we should also add the test_branch_revno to the metadata.

review: Needs Fixing

[lp:~cprov/core-image-tester/message-test-branch]

30. By Celso Providelo on 2015-04-08

'test_branch_revno' in the results metadata too.

[Celso Providelo (cprov)]

Francis & Psivaa,

Thanks for the review, r30 addresses your comments.

[Francis Ginther (fginther)]

Approve

review: Approve

=== modified file 'core_image_tester/worker.py'
--- core_image_tester/worker.py	2015-04-08 00:07:26 +0000
+++ core_image_tester/worker.py	2015-04-08 16:18:36 +0000
@@ -19,6 +19,7 @@
 import logging
 import os
 import shutil
+import subprocess
 import tarfile
 import tempfile
 
@@ -62,12 +63,16 @@
 
         with tempfile.TemporaryDirectory() as test_dir:
             logger.info("Downloading test sources...", extra=extra)
+            test_branch = self.config['adt']['test_branch']
             try:
-                get_test_sources(test_dir, self.config['adt']['test_branch'])
+                get_test_sources(test_dir, test_branch)
             except utils.BetterCalledProcessError as e:
                 logger.error("Unable to retrieve test sources: %s",
                              e, extra=extra)
                 return MessageActions.Retry
+            body['test_branch'] = test_branch
+            body['test_branch_revno'] = get_test_sources_revno(test_branch)
+            extra.update(body)
             logger.info("Test sources downloaded OK.", extra=extra)
 
             with tempfile.TemporaryDirectory() as result_dir:
@@ -85,6 +90,7 @@
                                  e, extra=extra)
                     return MessageActions.Retry
                 body['exit_code'] = exit_code
+                extra.update(body)
                 logger.info(
                     "Autopkgtest completed with exit code %s.",
                     exit_code,
@@ -142,6 +148,8 @@
     key_whitelist = [
         'channel',
         'device',
+        'test_branch',
+        'test_branch_revno',
         'exit_code',
         'nova_image_id',
         'image_name',
@@ -153,6 +161,19 @@
                 outfile.write("{}\t{}\n".format(key, request[key]))
 
 
+def get_test_sources_revno(test_branch):
+    """Return the current 'test_branch' revision number.
+
+    Errors are explicitly ignored and '-' is returned as revno.
+    """
+    try:
+        out = subprocess.check_output(['bzr', 'revno', test_branch])
+    except subprocess.CalledProcessError:
+        return '-'
+
+    return out.strip()
+
+
 def get_test_sources(target_dir, test_branch):
     """Copy the test sources into the target_dir.