From ab1010bcdbfbcb4f51ca356d7a453f6128a0dfbd Mon Sep 17 00:00:00 2001
From: Nils Dijk <nils@citusdata.com>
Date: Fri, 10 Nov 2023 14:52:34 +0000
Subject: [PATCH] run full matrix again

---
 .../workflows/packaging-test-pipelines.yml    | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml
index 3e530320b..e035a3a36 100644
--- a/.github/workflows/packaging-test-pipelines.yml
+++ b/.github/workflows/packaging-test-pipelines.yml
@@ -46,25 +46,21 @@ jobs:
         # based distros
         # For this reason, we need to use a "matrix" to generate names of
         # rpm images, e.g. citus/packaging:centos-7-pg12
-        # packaging_docker_image:
-        #   - oraclelinux-8
-        #   - almalinux-8
-        #   - almalinux-9
-        # POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}
-        # POSTGRES_VERSION:
-        #   - 16
+        packaging_docker_image:
+          - centos-7
+          - oraclelinux-7
+          - oraclelinux-8
+          - almalinux-8
+          - almalinux-9
+        POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}
         # Postgres removed support for CentOS 7 in PG 16. Below block is needed to
         # keep the build for CentOS 7 working for PG 14 and PG 15.
         # Once dependent systems drop support for Centos 7, we can remove this block.
-        include:
-          # - packaging_docker_image: centos-7
-          #   POSTGRES_VERSION: 14
-          # - packaging_docker_image: centos-7
-          #   POSTGRES_VERSION: 15
-          # - packaging_docker_image: oraclelinux-7
-          #   POSTGRES_VERSION: 14
+        exclude:
+          - packaging_docker_image: centos-7
+            POSTGRES_VERSION: 16
           - packaging_docker_image: oraclelinux-7
-            POSTGRES_VERSION: 15
+            POSTGRES_VERSION: 16          
 
     container:
       image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }}
@@ -130,10 +126,10 @@ jobs:
         # for each deb based image and we use POSTGRES_VERSION to set
         # PG_CONFIG variable in each of those runs.
         packaging_docker_image:
-          # - debian-buster-all
-          # - debian-bookworm-all
-          # - debian-bullseye-all
-          # - ubuntu-focal-all
+          - debian-buster-all
+          - debian-bookworm-all
+          - debian-bullseye-all
+          - ubuntu-focal-all
           - ubuntu-jammy-all
 
         POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}