No more tagging as 'latest' for our Docker arvados/jobs image

[arvados-dev.git] / jenkins / run_upload_packages.py

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index cce377ed4745e3785b05de849dd53b7d0538cd62..0fb921f1b70768910993de35ddb57888adfd94de 100755 (executable)
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -240,10 +240,8 @@ 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',
                         ),
     'gems': _define_suite(GemPackageSuite,
@@ -267,7 +265,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 +278,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 +319,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))