[ARVADOS-DEV] updated: 46c11708c09d6e5ff937f3fc194200d6726b3865

Git user git at public.curoverse.com
Sat Mar 19 12:42:20 EDT 2016


Summary of changes:
 jenkins/run_upload_packages.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

       via  46c11708c09d6e5ff937f3fc194200d6726b3865 (commit)
      from  23391a8d819238b3b9f934c93331a0d96a8dec85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 46c11708c09d6e5ff937f3fc194200d6726b3865
Author: Ward Vandewege <ward at curoverse.com>
Date:   Sat Mar 19 12:41:54 2016 -0400

    The upload script now uses a per-distro tmp directory.
    
    No issue #

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index 04e6c80..b44cbdc 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -137,7 +137,7 @@ class DistroPackageSuite(PackageSuite):
 
     def upload_files(self, paths):
         cmd = self._build_cmd('scp', *paths)
-        cmd.append('{self.ssh_host}:{self.REMOTE_DEST_DIR}'.format(self=self))
+        cmd.append('{self.ssh_host}:{self.REMOTE_DEST_DIR}/{self.target}'.format(self=self))
         subprocess.check_call(cmd)
 
 
@@ -157,7 +157,7 @@ rm "$@"
         }
 
     def post_uploads(self, paths):
-        self._run_script(self.FREIGHT_SCRIPT, self.REMOTE_DEST_DIR,
+        self._run_script(self.FREIGHT_SCRIPT, self.REMOTE_DEST_DIR + '/' + self.target,
                          self.TARGET_DISTNAMES[self.target],
                          *self._paths_basenames(paths))
 
@@ -178,7 +178,7 @@ createrepo "$REPODIR"
     def post_uploads(self, paths):
         repo_dir = os.path.join(self.REPO_ROOT,
                                 self.TARGET_REPODIRS[self.target])
-        self._run_script(self.CREATEREPO_SCRIPT, self.REMOTE_DEST_DIR,
+        self._run_script(self.CREATEREPO_SCRIPT, self.REMOTE_DEST_DIR + '/' + self.target,
                          repo_dir, *self._paths_basenames(paths))
 
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list