From 0fd2e9bfa2b0cecf5aed83b7adaf203e2fabd641 Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Thu, 17 Aug 2023 13:11:03 +0300
Subject: [PATCH] Reorganize failtester matrix

---
 .github/workflows/build_and_test.yml | 31 ++++++----------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index e7466c9dc..c788186ad 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -94,17 +94,9 @@ jobs:
           - "citus/extbuilder"
         image_suffix:
           - ${{ inputs.image_suffix}}
-        pg_major:
-          - 14
-          - 15
         pg_version:
           - ${{ inputs.pg14_version }}
           - ${{ inputs.pg15_version }}
-        exclude:
-          - pg_major: 14
-            pg_version: ${{ inputs.pg15_version }}
-          - pg_major: 15
-            pg_version: ${{ inputs.pg14_version }}
     runs-on: ubuntu-latest
     container:
       image: "${{ matrix.image_name }}:${{ matrix.pg_version  }}${{ matrix.image_suffix }}"
@@ -115,10 +107,10 @@ jobs:
       run: "./ci/build-citus.sh"
     - uses: actions/upload-artifact@v3.1.1
       with:
-        name: build-${{ matrix.pg_major }}
+        name: build-${{ matrix.pg_version }}
         path: |-
-          ./build-${{ matrix.pg_major  }}/*
-          ./install-${{ matrix.pg_major  }}.tar
+          ./build-${{ matrix.pg_version  }}/*
+          ./install-${{ matrix.pg_version  }}.tar
   test-citus-exttester:
     name: Test ${{ matrix.make }} PG${{ matrix.pg_version }}
     strategy:
@@ -128,9 +120,6 @@ jobs:
           - "citus/exttester"
         image_suffix:
           - ${{ inputs.image_suffix}}
-        pg_major:
-          - 14
-          - 15
         pg_version:
           - ${{ inputs.pg14_version }}
           - ${{ inputs.pg15_version }}
@@ -150,33 +139,25 @@ jobs:
           - check-enterprise-isolation-logicalrep-1
           - check-enterprise-isolation-logicalrep-2
           - check-enterprise-isolation-logicalrep-3
-        exclude:
-          - pg_major: 14
-            pg_version: ${{ inputs.pg15_version }}
-          - pg_major: 15
-            pg_version: ${{ inputs.pg14_version }}
         include:
           - make: check-failure
             image_name: "citus/failtester"
-            pg_major: [14, 15]
             pg_version:
               - ${{ inputs.pg15_version }}
               - ${{ inputs.pg14_version }}
           - make: check-enterprise-failure
             image_name: "citus/failtester"
-            pg_major: [14, 15]
             pg_version:
               - ${{ inputs.pg15_version }}
               - ${{ inputs.pg14_version }}
           - make: check-pytest
             image_name: "citus/failtester"
-            pg_major: [14, 15]
             pg_version:
               - ${{ inputs.pg15_version }}
               - ${{ inputs.pg14_version }}
     runs-on: ubuntu-latest
     container:
-      image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ inputs.image_suffix }}"
+      image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ matrix.image_suffix }}"
       options: --user root
     needs:
     - build
@@ -184,10 +165,10 @@ jobs:
     - uses: actions/checkout@v3.5.0
     - uses: actions/download-artifact@v3.0.1
       with:
-        name: build-${{ matrix.pg_major }}
+        name: build-${{ matrix.pg_version }}
     - uses: "./.github/actions/install_extension"
       with:
-        pg_major: "${{ matrix.pg_major }}"
+        pg_major: "${{ matrix.pg_version }}"
     - uses: "./.github/actions/configure"
     - uses: "./.github/actions/enable_core"
     - name: Run Test