Move gbs_update_dashboard to gbsutils.py

Change-Id: I162936d79bfb4964f9363cc8ec1eeb72921273ad

diff --git a/common/buildmonitor_extention.py b/common/buildmonitor_extention.py
index b7c3be4..28246ed 100644 (file)
--- a/common/buildmonitor_extention.py
+++ b/common/buildmonitor_extention.py
@@ -669,20 +669,4 @@ def find_my_ip():
     except Exception as err:
         return '0.0.0.0'
 
-def gbs_update_dashboard(raw_data, via='trigger'):
-    raw_data["_timestamp"] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    raw_data["_worker"] = {"node_name": os.getenv('NODE_NAME'),
-                          "ip": find_my_ip()}
-    if via == 'trigger':
-        trigger_next("DASHBOARD_UPDATE_%s" % raw_data.get("tag").replace('/', '_'), raw_data)
-    else:
-        try:
-            encoded_data = base64.b64encode(json.dumps(raw_data))
-            remote_jenkins_build_job(os.getenv('JENKINS_URL_INTERNAL'), \
-                                     os.getenv('JENKINS_USER'), \
-                                     os.getenv('JENKINS_PW'), \
-                                     jobname=os.getenv('DASHBOARD_UPDATE_JOB_NAME'), \
-                                     data='TRIGGER_INFO="%s"' % (quote_plus(encoded_data)))
-        except Exception as err:
-            trigger_next("DASHBOARD_UPDATE_%s" % raw_data.get("tag").replace('/', '_'), raw_data)
 

diff --git a/common/gbsutils.py b/common/gbsutils.py
index 99934a9..aa49a44 100644 (file)
--- a/common/gbsutils.py
+++ b/common/gbsutils.py
@@ -29,8 +29,9 @@ import base64
 import json
 from common.git import Git, clone_gitproject
 from common.utils import sync
-from common.buildtrigger import remote_jenkins_build_job
+from common.buildtrigger import remote_jenkins_build_job, trigger_next
 from urllib import quote_plus
+from datetime import datetime
 
 class RuntimeException(Exception):
     """Local error handler"""
@@ -756,3 +757,20 @@ class GBSBuild:
 
         return rpm_file_info
 
+def gbs_update_dashboard(raw_data, via='trigger'):
+    raw_data["_timestamp"] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    raw_data["_worker"] = {"node_name": os.getenv('NODE_NAME'),
+                          "ip": find_my_ip()}
+    if via == 'trigger':
+        trigger_next("DASHBOARD_UPDATE_%s" % raw_data.get("tag").replace('/', '_'), raw_data)
+    else:
+        try:
+            encoded_data = base64.b64encode(json.dumps(raw_data))
+            remote_jenkins_build_job(os.getenv('JENKINS_URL_INTERNAL'), \
+                                     os.getenv('JENKINS_USER'), \
+                                     os.getenv('JENKINS_PW'), \
+                                     jobname=os.getenv('DASHBOARD_UPDATE_JOB_NAME'), \
+                                     data='TRIGGER_INFO="%s"' % (quote_plus(encoded_data)))
+        except Exception as err:
+            trigger_next("DASHBOARD_UPDATE_%s" % raw_data.get("tag").replace('/', '_'), raw_data)
+