X-Git-Url: https://git.arvados.org/arvados-dev.git/blobdiff_plain/5cf15331acb6250da715ee9c41a2a0db7986917c..738bac6d373ec54b4bf75b2da71b9c65203ecc76:/jenkins/run_upload_packages.py diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py index 3eac15b..04e6c80 100755 --- 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 -TARGET=$1; shift -freight add "$@" "apt/$TARGET" -freight cache +DISTNAME=$1; shift +freight add "$@" "apt/$DISTNAME" +freight cache "apt/$DISTNAME" 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, - self.target, *self._paths_basenames(paths)) + self.TARGET_DISTNAMES[self.target], + *self._paths_basenames(paths)) class RedHatPackageSuite(DistroPackageSuite): @@ -180,12 +187,19 @@ def _define_suite(suite_class, *rel_globs, **kwargs): PACKAGE_SUITES = { 'python': _define_suite(PythonPackageSuite, + 'sdk/pam/dist/*.tar.gz', 'sdk/python/dist/*.tar.gz', + 'sdk/cwl/dist/*.tar.gz', + 'services/nodemanager/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)