projects
/
arvados-dev.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The upload script now uses a per-distro tmp directory.
[arvados-dev.git]
/
jenkins
/
run_upload_packages.py
diff --git
a/jenkins/run_upload_packages.py
b/jenkins/run_upload_packages.py
index 04e6c801a51eaf85c2c70da99c315696dc625b72..b44cbdc2cfe246ebe538e284b734ddb1b25cdf82 100755
(executable)
--- 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)
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)
subprocess.check_call(cmd)
@@
-157,7
+157,7
@@
rm "$@"
}
def post_uploads(self, paths):
}
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))
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])
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))
repo_dir, *self._paths_basenames(paths))