diff options
Diffstat (limited to 'utils/new-publish/publish')
| -rwxr-xr-x | utils/new-publish/publish | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/utils/new-publish/publish b/utils/new-publish/publish index 48912ad..b18e351 100755 --- a/utils/new-publish/publish +++ b/utils/new-publish/publish @@ -14,6 +14,10 @@ UPLOAD_DIR = "/uploads" COPY_KEY_FILE = "/var/run/lava/publish-copy" TRIGGER_KEY_FILE = "/var/run/lava/publish-trigger" +def log(msg): + print msg + sys.stdout.flush() + if __name__ == "__main__": optparser = optparse.OptionParser(usage="%prog <job/build> <pattern>...") optparser.add_option("-t", "--type", help="Build type") @@ -46,23 +50,22 @@ 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" + log("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" + log("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" + log("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" + log("Done uploading files to intermediate server") - print "Triggering propagation of files to downloads server" - sys.stdout.flush() + log("Triggering propagation of files to downloads server") rc = os.system("ssh -i %s %s@%s propagate.py %s %s %s" % (options.identity_trigger, TRIGGER_USER_NAME, REMOTE_HOST, "-s" if options.staging else "", "--host=%s" % options.host if options.host else "", build_id)) if rc != 0: - print "Publishing failed" + log("Publishing failed") sys.exit(1) - print "Publishing successful" + log("Publishing successful") |