1.Modify sync method from gbsfullbuild server to download server : Use rsync command...

2.Modify Build Monitor status update point for gbsfullbuild results

Change-Id: I81db641a86ad2c8d07cb2d59cf061643d1cd7a77

diff --git a/job_gbs_ref_fullbuild.py b/job_gbs_ref_fullbuild.py
index a839107..1221b43 100644 (file)
--- a/job_gbs_ref_fullbuild.py
+++ b/job_gbs_ref_fullbuild.py
@@ -463,15 +463,7 @@ def copy_build_results_to_dl_server():
     
     #Finally, rsync live folder to download server
     print 'rsync sync_out_dir: %s, sync_dest: %s' %(sync_out_dir, sync_dest)
-#    sync(sync_out_dir, sync_dest)
-    ret_code = -1
-    # Through rsync protocol
-    cmd = "rsync -av --delete --delay-updates %s/ %s" % (sync_out_dir, sync_dest)
-    try:
-        ret_code = subprocess.call(cmd, shell=True)
-    except OSError as err:
-        raise LocalError("Execution of %s failed: %s" %
-                               (cmd, str(err)))
+    sync(sync_out_dir, sync_dest)
 
 
 def main():
@@ -557,14 +549,6 @@ def main():
 
         os.chdir(original_dir)
 
-        # TRIGGER NEXT BUILD-MONITOR
-        update_message="Succeeded"
-        if len(update_message) < 119:
-            trigger_next("BUILD-MONITOR", \
-                 {'bm_stage':'GBSFULLBUILD_SNAPSHOT',
-                  'snapshot_name':ref_profile['ref_snapshot_build_id'],
-                  'gbsfullbuild_string': update_message})
-
         # TRIGGER NEXT GBSFULLBUILD-CREATE-SNAPSHOT
         trigger_next("gbsfullbuild-create-snapshot",\
             {'event':event,

diff --git a/job_gbsfullbuild_create_snapshot.py b/job_gbsfullbuild_create_snapshot.py
index 3b23f1e..be089db 100755 (executable)
--- a/job_gbsfullbuild_create_snapshot.py
+++ b/job_gbsfullbuild_create_snapshot.py
@@ -258,10 +258,18 @@ def main():
     data.pop('imagedata')
     trigger_next("gbsfullbuild-buildlogs", data)
 
-    # TRIGGER NEXT BUILD-MONITOR
+    # TRIGGER NEXT BUILD-MONITOR-Success
     update_message="Succeeded"
     if len(update_message) < 119:
-        trigger_next("BUILD-MONITOR", \
+        trigger_next("BUILD-MONITOR-Success", \
+                {'bm_stage':'GBSFULLBUILD_SNAPSHOT',
+                 'snapshot_name':snapshot_name,
+                 'gbsfullbuild_string': update_message})
+
+    # TRIGGER NEXT BUILD-MONITOR-Fail
+    update_message="Image Creation Failed"
+    if len(update_message) < 119:
+        trigger_next("BUILD-MONITOR-Failed", \
                 {'bm_stage':'GBSFULLBUILD_SNAPSHOT',
                  'snapshot_name':snapshot_name,
                  'gbsfullbuild_string': update_message})