Handle TRIGGER_INFO

Change-Id: I0057c850e65f7bca23e42dc4c7033829cd90f5f1

diff --git a/job_gbs_dashboard_build.py b/job_gbs_dashboard_build.py
index 43349e4..da3953d 100644 (file)
--- a/job_gbs_dashboard_build.py
+++ b/job_gbs_dashboard_build.py
@@ -16,8 +16,7 @@ from common.gerrit import Gerrit, get_gerrit_event, GerritError, is_ref_deleted
 from common.buildservice import BuildService
 from common.utils import sync
 from common.gbsutils import GBSBuild
-from common.buildtrigger import trigger_next
-
+from common.buildtrigger import trigger_info, trigger_next
 
 # prepare related global variables
 workspace = os.getenv('WORKSPACE')
@@ -62,18 +61,52 @@ def _check_mount_existance():
 
     now = datetime.now()
 
+def retrive_args_from_trigger(content):
+
+    data = {}
+
+    # Adjust
+    data["project"]      = content.get('main_project')
+    data["snapshot_num"] = content.get('source_snapshot').split("_")[-1]
+    data["full_dep_sel"] = "full build" if content.get('gbs_type') == "Full Build" else "dependency build"
+    data["new_packages"] = ""
+    data["rm_packages"] = ""
+    data["rm_image"] = "Not remove"
+    for x in content.get('packages'):
+        git_path = x.keys()[0]
+        commitid = x[git_path].get('commit')
+        include_build = 1 if x[git_path].get('build') == 'include' else 0
+        include_image = 1 if x[git_path].get('image') == 'include' else 0
+        if include_build == 0:
+            data["rm_packages"] = "%s %s" % (data["rm_packages"], "%s" % (git_path) )
+        elif include_build == 1:
+            data["new_packages"] = "%s %s" % (data["new_packages"], "%s %s" % (git_path, commitid) )
+        if include_image == 0:
+            data["rm_image"] = "Remove"
+
+    return data
 
 def main():
     """script entry point"""
 
     print '---[JOB STARTED]----------------------------------------'
 
-    obs_prj = os.getenv('PROJECT')
-    snapshot_num = os.getenv('SNAPSHOT')
-    full_dep_sel = os.getenv('FULL_DEP_SEL')
-    new_pkg_list = os.getenv('NEW_PKG_LIST')
-    rm_pkg_list = os.getenv('RM_PKG_LIST')
-    rm_from_img = os.getenv('RM_FROM_IMG')
+    if os.getenv('TRIGGER_INFO'):
+        content = trigger_info(os.getenv('TRIGGER_INFO'))
+        data = retrive_args_from_trigger(content)
+        obs_prj      = data.get('project')
+        snapshot_num = data.get('snapshot_num')
+        full_dep_sel = data.get('full_dep_sel')
+        new_pkg_list = data.get('new_packages')
+        rm_pkg_list  = data.get('rm_packages')
+        rm_from_img  = data.get('rm_image')
+    else:
+        obs_prj = os.getenv('PROJECT')
+        snapshot_num = os.getenv('SNAPSHOT')
+        full_dep_sel = os.getenv('FULL_DEP_SEL')
+        new_pkg_list = os.getenv('NEW_PKG_LIST')
+        rm_pkg_list = os.getenv('RM_PKG_LIST')
+        rm_from_img = os.getenv('RM_FROM_IMG')
 
     now = datetime.now()
     gbsdbbuild_project_id = '%04d%02d%02d.%02d%02d%02d' %(now.year,now.month,now.day,now.hour,now.minute,now.second)