From 961aa0b046824b21c73a2ef7386c78e3425325bb Mon Sep 17 00:00:00 2001
From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Wed, 8 Mar 2017 15:39:49 +0200
Subject: Install kingbird verifier extension for tempest

JIRA: FUNCTEST-742

Change-Id: I5de8ed22932250c542751e38eae3185c4a263cd0
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
---
 functest/ci/config_functest.yaml                   |  1 +
 .../opnfv_tests/openstack/tempest/conf_utils.py    | 24 ++++++++++++++++++++++
 functest/opnfv_tests/openstack/tempest/tempest.py  |  1 +
 3 files changed, 26 insertions(+)

(limited to 'functest')

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 3d576318..b5cec562 100755
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -38,6 +38,7 @@ general:
         functest_data:      /home/opnfv/functest/data
         ims_data:           /home/opnfv/functest/data/ims/
         rally_inst:         /home/opnfv/.rally
+        repo_kingbird:      /home/opnfv/repos/kingbird
 
     openstack:
         creds: /home/opnfv/functest/conf/openstack.creds
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 893fff8c..2c113367 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -106,6 +106,17 @@ def get_verifier_deployment_dir(verifier_id, deployment_id):
                         'for-deployment-{}'.format(deployment_id))
 
 
+def get_repo_tag(repo):
+    """
+    Returns last tag of current branch
+    """
+    cmd = ("git -C {0} describe --abbrev=0 HEAD".format(repo))
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
+    tag = p.stdout.readline().rstrip()
+
+    return str(tag)
+
+
 def backup_tempest_config(conf_file):
     """
     Copy config file to tempest results directory
@@ -276,3 +287,16 @@ def configure_tempest_multisite_params(tempest_conf_file):
         config.write(config_file)
 
     backup_tempest_config(tempest_conf_file)
+
+
+def install_verifier_ext(path):
+    """
+    Install extension to active verifier
+    """
+    logger.info("Installing verifier from existing repo...")
+    tag = get_repo_tag(path)
+    cmd = ("rally verify add-verifier-ext --source {0} "
+           "--version {1}"
+           .format(path, tag))
+    error_msg = ("Problem while adding verifier extension from %s" % path)
+    ft_utils.execute_command_raise(cmd, error_msg=error_msg)
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 4c96500d..569a6983 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -320,6 +320,7 @@ class TempestMultisite(TempestCommon):
         self.case_name = "multisite"
         self.MODE = "feature_multisite"
         self.OPTION = "--concurrency 1"
+        conf_utils.install_verifier_ext(CONST.dir_repo_kingbird)
 
 
 class TempestCustom(TempestCommon):
-- 
cgit 1.2.3-korg