[ARVADOS-DEV] updated: ab3b561fbe7a7007863782c1da380cedc1ff1718

[Git user]

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

       via  ab3b561fbe7a7007863782c1da380cedc1ff1718 (commit)
      from  ede846522cab94c8cec8d628b7989d1feea8bd36 (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 ab3b561fbe7a7007863782c1da380cedc1ff1718
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jan 24 11:29:04 2020 -0500

    Fix target check
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index cce377e..377c086 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -267,7 +267,7 @@ def parse_arguments(arguments):
     parser.add_argument('--verbose', '-v', action='count', default=0,
                         help="Log more information and subcommand output")
     parser.add_argument(
-        '--repo', choices=['dev', 'testing']
+        '--repo', choices=['dev', 'testing'],
         help="Whether to upload to dev (nightly) or testing (release candidate) repository")
 
     parser.add_argument(
@@ -280,6 +280,16 @@ def parse_arguments(arguments):
 
     if args.workspace is None:
         parser.error("workspace not set from command line or environment")
+
+    for target in ['debian8', 'debian9', 'debian10', 'ubuntu1404', 'ubuntu1604', 'ubuntu1804']:
+        PACKAGE_SUITES[target] = _define_suite(
+            DebianPackageSuite, os.path.join('packages', target, '*.deb'),
+            target=target, repo=args.repo)
+    for target in ['centos7']:
+        PACKAGE_SUITES[target] = _define_suite(
+            RedHatPackageSuite, os.path.join('packages', target, '*.rpm'),
+            target=target, repo=args.repo)
+
     for target in args.targets:
         try:
             suite_class = PACKAGE_SUITES[target].func
@@ -311,15 +321,6 @@ def main(arguments, stdout=sys.stdout, stderr=sys.stderr):
     args = parse_arguments(arguments)
     setup_logger(stderr, args)
 
-    for target in ['debian8', 'debian9', 'debian10', 'ubuntu1404', 'ubuntu1604', 'ubuntu1804']:
-        PACKAGE_SUITES[target] = _define_suite(
-            DebianPackageSuite, os.path.join('packages', target, '*.deb'),
-            target=target, repo=args.repo)
-    for target in ['centos7']:
-        PACKAGE_SUITES[target] = _define_suite(
-            RedHatPackageSuite, os.path.join('packages', target, '*.rpm'),
-            target=target, repo=args.repo)
-
     for target in args.targets:
         ts_file = TimestampFile(os.path.join(args.workspace, 'packages',
                                              '.last_upload_%s' % target))

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


hooks/post-receive
--