20846: Add debian12 and ubuntu2204 upload targets
authorBrett Smith <brett.smith@curii.com>
Fri, 29 Dec 2023 14:59:38 +0000 (09:59 -0500)
committerBrett Smith <brett.smith@curii.com>
Fri, 29 Dec 2023 14:59:38 +0000 (09:59 -0500)
I also checked testing_to_stable_publish_packages.sh and
upload_packages_testing_to_stable.sh but there doesn't seem to be
anything to update in those. They seem to default to working on
deb-based distributions just fine.

Refs #20846.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

jenkins/run_upload_packages.py

index 7ed9c1653755fb4fcf9af6bf43fc411e590ba401..d199197cb152fafdcc744eb4a464f8247ad2f1f2 100755 (executable)
@@ -227,8 +227,10 @@ aptly publish update "$DISTNAME" filesystem:"${DISTNAME%-*}":
         self.TARGET_DISTNAMES = {
             'debian10': 'buster-'+repo,
             'debian11': 'bullseye-'+repo,
+            'debian12': 'bookworm-'+repo,
             'ubuntu1804': 'bionic-'+repo,
             'ubuntu2004': 'focal-'+repo,
+            'ubuntu2204': 'jammy-'+repo,
             }
 
     def post_uploads(self, paths):
@@ -306,7 +308,10 @@ def parse_arguments(arguments):
     if args.workspace is None:
         parser.error("workspace not set from command line or environment")
 
-    for target in ['debian10', 'debian11', 'ubuntu1804', 'ubuntu2004']:
+    for target in [
+            'debian10', 'debian11', 'debian12',
+            'ubuntu1804', 'ubuntu2004', 'ubuntu2204',
+    ]:
         PACKAGE_SUITES[target] = _define_suite(
             DebianPackageSuite, os.path.join('packages', target, '*.deb'),
             target=target, repo=args.repo)