Added correct remote dir

Corrected path to keys and existent build list

2 files changed, 7 insertions, 7 deletions

diff --git a/utils/sync-builds/config.py b/utils/sync-builds/config.py
index a325ea1..9302789 100755
--- a/utils/sync-builds/config.py
+++ b/utils/sync-builds/config.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 
 host = "mombin.canonical.com"
-sync_key_file = '/home/ubuntu/snapshots-sync'
-move_key_file = '/home/ubuntu/snapshots-filemove'
+sync_key_file = '/home/ubuntu/snapshots-sync/snapshots-sync'
+move_key_file = '/home/ubuntu/snapshots-sync/snapshots-filemove'
 sync_user = 'android-build-linaro'
 move_user = 'android-build-linaro-trigger'
 move_cmd = 'reshuffle-files'
 jobs_path = '/var/lib/jenkins/jobs'
-
 jobs_list = ['linaro-android']
+remote_prefix = 'android/.tmp/'
 source_files = ['build/out/target/*/*/*.img',
                 'build/out/target/*/*/*.tar.bz2',
                 'build/out/target/*/*/MD5SUMS',
diff --git a/utils/sync-builds/sync-builds.py b/utils/sync-builds/sync-builds.py
index 1ec8405..d7b729e 100755
--- a/utils/sync-builds/sync-builds.py
+++ b/utils/sync-builds/sync-builds.py
@@ -28,15 +28,15 @@ def do_sftp_transfer(build, path_to_create, files):
     fnull = open(os.devnull, 'w')
 
     for path in path_to_create:
-        os.write(fd, '-mkdir ' + str(path) + '\n')
+        os.write(fd, '-mkdir ' + remote_prefix + str(path) + '\n')
     for rfile in files:
-        os.write(fd, '-put ' + str(rfile) + ' ' +
+        os.write(fd, '-put ' + str(rfile) + ' ' + remote_prefix +
                 os.path.dirname(remove_prefix.sub('', str(rfile))) + '\n')
     os.close(fd)
     subprocess.call(["sftp", "-i", sync_key_file, "-q", "-r", "-b", fpath,
         "%s@%s" % (sync_user, host)], stdout = fnull, stderr = fnull)
     subprocess.call(["ssh", "-i", move_key_file, "%s@%s" % (move_user, host),
-        move_cmd, build], stdout = fnull, stderr = fnull)
+        move_cmd, build])
 
     fnull.close()
     os.remove(fpath)
@@ -95,7 +95,7 @@ def move_files(job):
 
 
 if __name__ == '__main__':
-    builds_list = load_build_list("./builds_list")
+    builds_list = load_build_list("./builds-on-snapshots")
     cwd = os.getcwd()
     os.chdir(jobs_path)
     for ejob in jobs_list: