From 61a1e20a74ccbabd6af951047143b19a64f2af12 Mon Sep 17 00:00:00 2001 From: Ibrahim Halatci Date: Tue, 7 Jul 2026 18:08:42 +0300 Subject: [PATCH 1/2] Add Ubuntu 26.04 (resolute) as a supported platform Mirror the existing noble (Ubuntu 24.04) wiring to add resolute (Ubuntu 26.04 LTS, "Resolute Raccoon"): - common_tool_methods.py: append "resolute" to supported_platforms["ubuntu"], which is the argparse gate built by platform_names(). - citus_package.py: add "ubuntu,resolute" -> "ubuntu/resolute" to package_docker_platform_dict. - upload_to_package_cloud.py: add "ubuntu/resolute" distro_version_id placeholder -1 (TODO: real packagecloud id for Ubuntu 26.04) so uploads fail safely until filled. - test_citus_package.py + tests/test_citus_package.py: add the resolute test platform and its expected package count. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- packaging_automation/citus_package.py | 1 + packaging_automation/common_tool_methods.py | 2 +- packaging_automation/test_citus_package.py | 4 ++++ packaging_automation/tests/test_citus_package.py | 1 + packaging_automation/upload_to_package_cloud.py | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packaging_automation/citus_package.py b/packaging_automation/citus_package.py index 59fee1c9..74b699d0 100644 --- a/packaging_automation/citus_package.py +++ b/packaging_automation/citus_package.py @@ -65,6 +65,7 @@ "ubuntu,jammy": "ubuntu/jammy", "ubuntu,kinetic": "ubuntu/kinetic", "ubuntu,noble": "ubuntu/noble", + "ubuntu,resolute": "ubuntu/resolute", "pgxn": "pgxn", } diff --git a/packaging_automation/common_tool_methods.py b/packaging_automation/common_tool_methods.py index 33c35f75..df3a599b 100644 --- a/packaging_automation/common_tool_methods.py +++ b/packaging_automation/common_tool_methods.py @@ -49,7 +49,7 @@ "almalinux": ["8", "9"], "el": ["9", "8", "7", "6"], "ol": ["9", "8", "7"], - "ubuntu": ["focal", "bionic", "trusty", "jammy", "kinetic", "noble"], + "ubuntu": ["focal", "bionic", "trusty", "jammy", "kinetic", "noble", "resolute"], } diff --git a/packaging_automation/test_citus_package.py b/packaging_automation/test_citus_package.py index 6705e78d..df51f352 100644 --- a/packaging_automation/test_citus_package.py +++ b/packaging_automation/test_citus_package.py @@ -50,6 +50,10 @@ class TestPlatform(Enum): ubuntu_focal = {"name": "ubuntu/focal", "docker_image_name": "ubuntu-focal"} ubuntu_jammy = {"name": "ubuntu/jammy", "docker_image_name": "ubuntu-jammy"} ubuntu_noble = {"name": "ubuntu/noble", "docker_image_name": "ubuntu-noble"} + ubuntu_resolute = { + "name": "ubuntu/resolute", + "docker_image_name": "ubuntu-resolute", + } ubuntu_kinetic = {"name": "ubuntu/kinetic", "docker_image_name": "ubuntu-kinetic"} undefined = {"name": "undefined", "docker_image_name": "undefined"} diff --git a/packaging_automation/tests/test_citus_package.py b/packaging_automation/tests/test_citus_package.py index 1dcf5434..f5e0f196 100644 --- a/packaging_automation/tests/test_citus_package.py +++ b/packaging_automation/tests/test_citus_package.py @@ -61,6 +61,7 @@ "ubuntu/jammy": 2, "ubuntu/kinetic": 2, "ubuntu/noble": 2, + "ubuntu/resolute": 2, } TEST_GPG_KEY_NAME = "Citus Data " diff --git a/packaging_automation/upload_to_package_cloud.py b/packaging_automation/upload_to_package_cloud.py index d2b4f8f2..2db712c7 100644 --- a/packaging_automation/upload_to_package_cloud.py +++ b/packaging_automation/upload_to_package_cloud.py @@ -25,6 +25,7 @@ "ubuntu/focal": 210, "ubuntu/jammy": 237, "ubuntu/noble": 284, + "ubuntu/resolute": -1, # TODO: real packagecloud distro_version_id for Ubuntu 26.04 (resolute); -1 is a loud placeholder so uploads fail safely until filled "ubuntu/kinetic": 261, } From 47476cb5e3565153bd3fb72b638176e0ea16618d Mon Sep 17 00:00:00 2001 From: Ibrahim Halatci Date: Wed, 8 Jul 2026 12:43:00 +0300 Subject: [PATCH 2/2] Set real packagecloud distro_version_id for Ubuntu resolute Replace the -1 placeholder for "ubuntu/resolute" with the actual packagecloud distro_version_id 320 (Ubuntu 26.04), mirroring the existing noble entry. Uploads to packagecloud can now target resolute. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- packaging_automation/upload_to_package_cloud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging_automation/upload_to_package_cloud.py b/packaging_automation/upload_to_package_cloud.py index 2db712c7..2119aa15 100644 --- a/packaging_automation/upload_to_package_cloud.py +++ b/packaging_automation/upload_to_package_cloud.py @@ -25,7 +25,7 @@ "ubuntu/focal": 210, "ubuntu/jammy": 237, "ubuntu/noble": 284, - "ubuntu/resolute": -1, # TODO: real packagecloud distro_version_id for Ubuntu 26.04 (resolute); -1 is a loud placeholder so uploads fail safely until filled + "ubuntu/resolute": 320, "ubuntu/kinetic": 261, }