From c9ae2766fd566358a1ac3a38a7dc6f7b22a3449f Mon Sep 17 00:00:00 2001
From: Martin Klozik <martinx.klozik@intel.com>
Date: Wed, 23 Aug 2017 14:31:31 +0100
Subject: opnfvresultdb: Update data reported to result DB

Data reported to result DB were updated to comply
with recent API version and requirements.

JIRA: VSPERF-488

Change-Id: I6ab02ea54d99099e88b0d5ab6e9745ee8297f544
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Signed-off-by: Mars Toktonaliev <mars.toktonaliev@nokia.com>
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Trevor Cooper <trevor.cooper@intel.com>
---
 vsperf | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'vsperf')

diff --git a/vsperf b/vsperf
index bb0e199b..f4bc63b8 100755
--- a/vsperf
+++ b/vsperf
@@ -306,7 +306,18 @@ def get_vswitch_names(rst_files):
     # fallback to the default value
     return ['vSwitch']
 
+def get_build_tag():
+    """ Function will return a Jenkins job ID environment variable.
+    """
+
+    try:
+        build_tag = os.environ['BUILD_TAG']
+
+    except KeyError:
+        _LOGGER.warning('Cannot detect Jenkins job ID')
+        build_tag = "none"
 
+    return build_tag
 
 def generate_final_report():
     """ Function will check if partial test results are available
@@ -692,12 +703,14 @@ def main():
 
         if args['opnfvpod']:
             pod_name = args['opnfvpod']
-            installer_name = settings.getValue('OPNFV_INSTALLER')
+            installer_name = str(settings.getValue('OPNFV_INSTALLER')).lower()
             opnfv_url = settings.getValue('OPNFV_URL')
             pkg_list = settings.getValue('PACKAGE_LIST')
 
             int_data = {'vanilla': False,
                         'pod': pod_name,
+                        'criteria': "PASS",
+                        'build_tag': get_build_tag(),
                         'installer': installer_name,
                         'pkg_list': pkg_list,
                         'db_url': opnfv_url}
-- 
cgit 1.2.3-korg