test-runner: added support for test version

Change-Id: Idc255ad3e01c5ab95f259221fc901b93c2362862
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

1 files changed, 18 insertions, 0 deletions

diff --git a/automated/utils/test-runner.py b/automated/utils/test-runner.py
index 8740d20..da719c3 100755
--- a/automated/utils/test-runner.py
+++ b/automated/utils/test-runner.py
@@ -7,6 +7,7 @@ import logging
 import os
 import re
 import shutil
+import subprocess
 import sys
 import time
 from uuid import uuid4
@@ -87,6 +88,7 @@ class TestSetup(object):
         self.test_path = os.path.join(self.output, self.test_uuid)
         self.logger = logging.getLogger('RUNNER.TestSetup')
         self.test_kind = args.kind
+        self.test_version = test.get('version', None)
 
     def validate_env(self):
         # Inspect if environment set properly.
@@ -116,6 +118,13 @@ class TestSetup(object):
             shutil.copytree(self.repo_path, self.test_path, symlinks=True)
             self.logger.info('Test repo copied to: %s' % self.test_path)
 
+    def checkout_version(self):
+        if self.test_version:
+            path = os.getcwd()
+            os.chdir(self.test_path)
+            subprocess.call("git checkout %s" % self.test_version, shell=True)
+            os.chdir(path)
+
     def create_uuid_file(self):
         with open('%s/uuid' % self.test_path, 'w') as f:
             f.write(self.uuid)
@@ -397,6 +406,14 @@ class ResultParser(object):
             self.results['params'] = test['parameters']
         if 'params' in test.keys():
             self.results['params'] = test['params']
+        if 'version' in test.keys():
+            self.results['version'] = test['version']
+        else:
+            path = os.getcwd()
+            os.chdir(self.result_path)
+            test_version = subprocess.check_output("git rev-parse HEAD", shell=True)
+            self.results['version'] = test_version.rstrip()
+            os.chdir(path)
 
     def run(self):
         self.parse_stdout()
@@ -536,6 +553,7 @@ def main():
         setup = TestSetup(test, args)
         setup.create_dir()
         setup.copy_test_repo()
+        setup.checkout_version()
         setup.create_uuid_file()
 
         # Convert test definition.