Update martix

Author: tuhaihe

.github/workflows/package-convenience-binaries.yml

@@ -97,20 +97,6 @@ concurrency:
 env:
   LOG_RETENTION_DAYS: 14
   KEYS_URL: https://downloads.apache.org/incubator/cloudberry/KEYS
-  # Shared platform matrix for build-packages and package-install-test jobs
-  # Each entry includes: target_os, target_arch, package_type, runner,
-  # build_container_image, test_container_image, and label (for test job)
-  PLATFORMS: |-
-    [
-      {"target_os": "rocky8", "target_arch": "x86_64", "package_type": "rpm", "runner": "ubuntu-24.04", "build_container_image": "apache/incubator-cloudberry:cbdb-build-rocky8-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-rocky8-latest", "label": "rocky8-x86_64-rpm"},
-      {"target_os": "rocky8", "target_arch": "arm64", "package_type": "rpm", "runner": "ubuntu-24.04-arm", "build_container_image": "apache/incubator-cloudberry:cbdb-build-rocky8-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-rocky8-latest", "label": "rocky8-arm64-rpm"},
-      {"target_os": "rocky9", "target_arch": "x86_64", "package_type": "rpm", "runner": "ubuntu-24.04", "build_container_image": "apache/incubator-cloudberry:cbdb-build-rocky9-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-rocky9-latest", "label": "rocky9-x86_64-rpm"},
-      {"target_os": "rocky9", "target_arch": "arm64", "package_type": "rpm", "runner": "ubuntu-24.04-arm", "build_container_image": "apache/incubator-cloudberry:cbdb-build-rocky9-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-rocky9-latest", "label": "rocky9-arm64-rpm"},
-      {"target_os": "ubuntu22.04", "target_arch": "x86_64", "package_type": "deb", "runner": "ubuntu-24.04", "build_container_image": "apache/incubator-cloudberry:cbdb-build-ubuntu22.04-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-ubuntu22.04-latest", "label": "ubuntu22.04-x86_64-deb"},
-      {"target_os": "ubuntu22.04", "target_arch": "arm64", "package_type": "deb", "runner": "ubuntu-24.04-arm", "build_container_image": "apache/incubator-cloudberry:cbdb-build-ubuntu22.04-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-ubuntu22.04-latest", "label": "ubuntu22.04-arm64-deb"},
-      {"target_os": "ubuntu24.04", "target_arch": "x86_64", "package_type": "deb", "runner": "ubuntu-24.04", "build_container_image": "apache/incubator-cloudberry:cbdb-build-ubuntu24.04-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-ubuntu24.04-latest", "label": "ubuntu24.04-x86_64-deb"},
-      {"target_os": "ubuntu24.04", "target_arch": "arm64", "package_type": "deb", "runner": "ubuntu-24.04-arm", "build_container_image": "apache/incubator-cloudberry:cbdb-build-ubuntu24.04-latest", "test_container_image": "apache/incubator-cloudberry:cbdb-test-ubuntu24.04-latest", "label": "ubuntu24.04-arm64-deb"}
-    ]
 
 jobs:
   verify-source-release:
@@ -351,7 +337,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ${{ fromJSON(env.PLATFORMS) }}
+        platform:
+          # RPM Package
+          - {target_os: rocky8, target_arch: x86_64, package_type: rpm, runner: ubuntu-24.04, build_container_image: apache/incubator-cloudberry:cbdb-build-rocky8-latest}
+          - {target_os: rocky8, target_arch: arm64, package_type: rpm, runner: ubuntu-24.04-arm, build_container_image: apache/incubator-cloudberry:cbdb-build-rocky8-latest}
+          - {target_os: rocky9, target_arch: x86_64, package_type: rpm, runner: ubuntu-24.04, build_container_image: apache/incubator-cloudberry:cbdb-build-rocky9-latest}
+          - {target_os: rocky9, target_arch: arm64, package_type: rpm, runner: ubuntu-24.04-arm, build_container_image: apache/incubator-cloudberry:cbdb-build-rocky9-latest}
+          # DEB Package
+          - {target_os: ubuntu22.04, target_arch: x86_64, package_type: deb, runner: ubuntu-24.04, build_container_image: apache/incubator-cloudberry:cbdb-build-ubuntu22.04-latest}
+          - {target_os: ubuntu22.04, target_arch: arm64, package_type: deb, runner: ubuntu-24.04-arm, build_container_image: apache/incubator-cloudberry:cbdb-build-ubuntu22.04-latest}
+          - {target_os: ubuntu24.04, target_arch: x86_64, package_type: deb, runner: ubuntu-24.04, build_container_image: apache/incubator-cloudberry:cbdb-build-ubuntu24.04-latest}
+          - {target_os: ubuntu24.04, target_arch: arm64, package_type: deb, runner: ubuntu-24.04-arm, build_container_image: apache/incubator-cloudberry:cbdb-build-ubuntu24.04-latest}
 
     steps:
       - name: Free disk space
@@ -548,7 +544,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ${{ fromJSON(env.PLATFORMS) }}
+        platform:
+          # RPM Package
+          - {target_os: rocky8, target_arch: x86_64, package_type: rpm, runner: ubuntu-24.04, test_container_image: apache/incubator-cloudberry:cbdb-test-rocky8-latest, label: rocky8-x86_64-rpm}
+          - {target_os: rocky8, target_arch: arm64, package_type: rpm, runner: ubuntu-24.04-arm, test_container_image: apache/incubator-cloudberry:cbdb-test-rocky8-latest, label: rocky8-arm64-rpm}
+          - {target_os: rocky9, target_arch: x86_64, package_type: rpm, runner: ubuntu-24.04, test_container_image: apache/incubator-cloudberry:cbdb-test-rocky9-latest, label: rocky9-x86_64-rpm}
+          - {target_os: rocky9, target_arch: arm64, package_type: rpm, runner: ubuntu-24.04-arm, test_container_image: apache/incubator-cloudberry:cbdb-test-rocky9-latest, label: rocky9-arm64-rpm}
+          # DEB Package
+          - {target_os: ubuntu22.04, target_arch: x86_64, package_type: deb, runner: ubuntu-24.04, test_container_image: apache/incubator-cloudberry:cbdb-test-ubuntu22.04-latest, label: ubuntu22.04-x86_64-deb}
+          - {target_os: ubuntu22.04, target_arch: arm64, package_type: deb, runner: ubuntu-24.04-arm, test_container_image: apache/incubator-cloudberry:cbdb-test-ubuntu22.04-latest, label: ubuntu22.04-arm64-deb}
+          - {target_os: ubuntu24.04, target_arch: x86_64, package_type: deb, runner: ubuntu-24.04, test_container_image: apache/incubator-cloudberry:cbdb-test-ubuntu24.04-latest, label: ubuntu24.04-x86_64-deb}
+          - {target_os: ubuntu24.04, target_arch: arm64, package_type: deb, runner: ubuntu-24.04-arm, test_container_image: apache/incubator-cloudberry:cbdb-test-ubuntu24.04-latest, label: ubuntu24.04-arm64-deb}
 
     steps:
       - name: Initialize test container