From 6cb2626c1c9924d35b2ee3524315b3371b01f323 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Date: Tue, 4 Jun 2013 14:12:18 +0300
Subject: Make publishing progress logging more verbose.

---
 utils/new-publish/propagate.py | 6 ++++++
 utils/new-publish/publish      | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/new-publish/propagate.py b/utils/new-publish/propagate.py
index e279e37..349a7a7 100755
--- a/utils/new-publish/propagate.py
+++ b/utils/new-publish/propagate.py
@@ -54,20 +54,26 @@ if __name__ == "__main__":
         dir_list = publib.make_dir_struct(file_list, REMOTE_UPLOAD_DIR, strip=strip)
         print "Dirs:", dir_list
         if not options.dry_run:
+            print "Creating dir structure on upload server"
             publib.create_dir_struct(dir_list, remote_host, PUBLISH_USER_NAME,
                                       options.identity_publish)
+            print "Done creating dir structure on upload server"
         upload_script = publib.make_upload_script(file_list, REMOTE_UPLOAD_DIR, strip=strip)
+        print "Uploading files to upload server"
         publib.upload_files(upload_script, remote_host, PUBLISH_USER_NAME,
                              options.identity_publish, options)
+        print "Done uploading files to upload server"
 
     if options.step in ("all", "2"):
         job, build = args[0].split("/")
         client = paramiko.SSHClient()
         client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         client.connect(remote_host, username=TRIGGER_USER_NAME, key_filename=TRIGGER_KEY_FILE)
+        print "Triggering moving of files from upload to download area"
         stdin, stdout, stderr = client.exec_command("reshuffle-files -t android -j %s -n %s -m %s" % (job, build, opt_staging))
         stdin.close()
         rc = stdout.channel.recv_exit_status()
+        print "Moving phase completed with result: %d" % rc
         print "=== stdout ==="
         print stdout.read()
         print "=== stderr ==="
diff --git a/utils/new-publish/publish b/utils/new-publish/publish
index bae8ac0..48912ad 100755
--- a/utils/new-publish/publish
+++ b/utils/new-publish/publish
@@ -46,11 +46,15 @@ if __name__ == "__main__":
     print "File list:", file_list
     dir_list = publib.make_dir_struct(file_list, UPLOAD_DIR, build_id, options.strip)
     print "Dir list:", dir_list
+    print "Creating dir structure on intermediate server"
     publib.create_dir_struct(dir_list, REMOTE_HOST, COPY_USER_NAME, options.identity_copy)
+    print "Done creating dir structure on intermediate server"
     upload_script = publib.make_upload_script(file_list, UPLOAD_DIR, build_id, options.strip)
+    print "Uploading files to intermediate server"
     publib.upload_files(upload_script, REMOTE_HOST, COPY_USER_NAME, options.identity_copy, options)
+    print "Done uploading files to intermediate server"
 
-    print "Propagating files to the downloads server"
+    print "Triggering propagation of files to downloads server"
     sys.stdout.flush()
     rc = os.system("ssh -i %s %s@%s propagate.py %s %s %s" % (options.identity_trigger,
         TRIGGER_USER_NAME, REMOTE_HOST,
@@ -60,3 +64,5 @@ if __name__ == "__main__":
     if rc != 0:
         print "Publishing failed"
         sys.exit(1)
+
+    print "Publishing successful"
-- 
cgit v1.2.3