[ARVADOS-DEV] created: 0947366de721eec9b0ef86adeb3acf9b165bcde4
Git user
git at public.curoverse.com
Fri May 27 23:32:28 EDT 2016
at 0947366de721eec9b0ef86adeb3acf9b165bcde4 (commit)
commit 0947366de721eec9b0ef86adeb3acf9b165bcde4
Author: Brett Smith <brett at curoverse.com>
Date: Fri May 27 23:31:56 2016 -0400
9309: Add support for uploading centos7 packages.
diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index 62e5716..57cedea 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -172,7 +172,8 @@ createrepo "$REPODIR"
"""
REPO_ROOT = '/var/www/rpm.arvados.org/'
TARGET_REPODIRS = {
- 'centos6': 'CentOS/6/os/x86_64/'
+ 'centos6': 'CentOS/6/os/x86_64/',
+ 'centos7': 'CentOS/7/os/x86_64/',
}
def post_uploads(self, paths):
@@ -203,7 +204,7 @@ for target in ['debian7', 'debian8', 'ubuntu1204', 'ubuntu1404']:
PACKAGE_SUITES[target] = _define_suite(
DebianPackageSuite, os.path.join('packages', target, '*.deb'),
target=target)
-for target in ['centos6']:
+for target in ['centos6', 'centos7']:
PACKAGE_SUITES[target] = _define_suite(
RedHatPackageSuite, os.path.join('packages', target, '*.rpm'),
target=target)
commit 557a1920fcb40f6470f0d9be295589d3cb87d66f
Author: Brett Smith <brett at curoverse.com>
Date: Fri May 27 23:24:13 2016 -0400
9224: Update each TimestampFile after upload.
This is a follow-up to 2fecb120e5b9be7a85f209e90114731f3e95f709.
diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index 98c1ab2..62e5716 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -267,7 +267,7 @@ def main(arguments, stdout=sys.stdout, stderr=sys.stderr):
'.last_upload_%s' % target))
last_upload_ts = ts_file.last_upload()
build_suite_and_upload(target, last_upload_ts, args)
- ts_file.update()
+ ts_file.update()
if __name__ == '__main__':
main(sys.argv[1:])
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list