projects
/
arvados-dev.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7829-package-licenses-wip'
[arvados-dev.git]
/
jenkins
/
run_upload_packages.py
diff --git
a/jenkins/run_upload_packages.py
b/jenkins/run_upload_packages.py
index 3eac15b2305bcbf2ec940aa51ff0837c7dc76602..04e6c801a51eaf85c2c70da99c315696dc625b72 100755
(executable)
--- a/
jenkins/run_upload_packages.py
+++ b/
jenkins/run_upload_packages.py
@@
-144,15
+144,22
@@
class DistroPackageSuite(PackageSuite):
class DebianPackageSuite(DistroPackageSuite):
FREIGHT_SCRIPT = """
cd "$1"; shift
class DebianPackageSuite(DistroPackageSuite):
FREIGHT_SCRIPT = """
cd "$1"; shift
-
TARGET
=$1; shift
-freight add "$@" "apt/$
TARGET
"
-freight cache
+
DISTNAME
=$1; shift
+freight add "$@" "apt/$
DISTNAME
"
+freight cache
"apt/$DISTNAME"
rm "$@"
"""
rm "$@"
"""
+ TARGET_DISTNAMES = {
+ 'debian7': 'wheezy',
+ 'debian8': 'jessie',
+ 'ubuntu1204': 'precise',
+ 'ubuntu1404': 'trusty',
+ }
def post_uploads(self, paths):
self._run_script(self.FREIGHT_SCRIPT, self.REMOTE_DEST_DIR,
def post_uploads(self, paths):
self._run_script(self.FREIGHT_SCRIPT, self.REMOTE_DEST_DIR,
- self.target, *self._paths_basenames(paths))
+ self.TARGET_DISTNAMES[self.target],
+ *self._paths_basenames(paths))
class RedHatPackageSuite(DistroPackageSuite):
class RedHatPackageSuite(DistroPackageSuite):
@@
-180,12
+187,19
@@
def _define_suite(suite_class, *rel_globs, **kwargs):
PACKAGE_SUITES = {
'python': _define_suite(PythonPackageSuite,
PACKAGE_SUITES = {
'python': _define_suite(PythonPackageSuite,
+ 'sdk/pam/dist/*.tar.gz',
'sdk/python/dist/*.tar.gz',
'sdk/python/dist/*.tar.gz',
+ 'sdk/cwl/dist/*.tar.gz',
+ 'services/nodemanager/dist/*.tar.gz',
'services/fuse/dist/*.tar.gz',
'services/fuse/dist/*.tar.gz',
- 'services/nodemanager/dist/*.tar.gz'),
- 'gems': _define_suite(GemPackageSuite, 'sdk/ruby/*.gem', 'sdk/cli/*.gem'),
+ ),
+ 'gems': _define_suite(GemPackageSuite,
+ 'sdk/ruby/*.gem',
+ 'sdk/cli/*.gem',
+ 'services/login-sync/*.gem',
+ ),
}
}
-for target in ['debian7', 'debian8', 'ubuntu1204']:
+for target in ['debian7', 'debian8', 'ubuntu1204'
, 'ubuntu1404'
]:
PACKAGE_SUITES[target] = _define_suite(
DebianPackageSuite, os.path.join('packages', target, '*.deb'),
target=target)
PACKAGE_SUITES[target] = _define_suite(
DebianPackageSuite, os.path.join('packages', target, '*.deb'),
target=target)