From daa327db41e3ca53b6f450613632cff754dafa62 Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Wed, 20 Sep 2023 10:49:54 +0300
Subject: [PATCH] Add PG16 to matrix.

---
 .github/workflows/build_and_test.yml | 59 +++++++++++++++++++---------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index c48d6ff1c..18c83dd0f 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -79,6 +79,7 @@ jobs:
         pg_version:
           - ${{ vars.pg14_version }}
           - ${{ vars.pg15_version }}
+          - ${{ vars.pg16_version }}
     runs-on: ubuntu-latest
     container:
       image: "${{ matrix.image_name }}:${{ matrix.pg_version  }}${{ matrix.image_suffix }}"
@@ -109,6 +110,7 @@ jobs:
         pg_version:
           - ${{ vars.pg14_version }}
           - ${{ vars.pg15_version }}
+          - ${{ vars.pg16_version }}
         make:
           - check-split
           - check-multi
@@ -134,6 +136,10 @@ jobs:
             pg_version: ${{ vars.pg15_version }}
             suite: regress
             image_name: ${{ vars.fail_test_image_name }}
+          - make: check-failure
+            pg_version: ${{ vars.pg16_version }}
+            suite: regress
+            image_name: ${{ vars.fail_test_image_name }}
           - make: check-enterprise-failure
             pg_version: ${{ vars.pg14_version }}
             suite: regress
@@ -142,6 +148,10 @@ jobs:
             pg_version: ${{ vars.pg15_version }}
             suite: regress
             image_name: ${{ vars.fail_test_image_name }}
+          - make: check-enterprise-failure
+            pg_version: ${{ vars.pg16_version }}
+            suite: regress
+            image_name: ${{ vars.fail_test_image_name }}
           - make: check-pytest
             pg_version: ${{ vars.pg14_version }}
             suite: regress
@@ -150,10 +160,18 @@ jobs:
             pg_version: ${{ vars.pg15_version }}
             suite: regress
             image_name: ${{ vars.fail_test_image_name }}
+          - make: check-pytest
+            pg_version: ${{ vars.pg16_version }}
+            suite: regress
+            image_name: ${{ vars.fail_test_image_name }}
           - make: installcheck
             suite: cdc
             image_name: ${{ vars.test_image_name }}
             pg_version: ${{ vars.pg15_version }}
+          - make: installcheck
+            suite: cdc
+            image_name: ${{ vars.test_image_name }}
+            pg_version: ${{ vars.pg16_version }}
           - make: check-query-generator
             pg_version: ${{ vars.pg14_version }}
             suite: regress
@@ -162,6 +180,10 @@ jobs:
             pg_version: ${{ vars.pg15_version }}
             suite: regress
             image_name: ${{ vars.fail_test_image_name }}
+          - make: check-query-generator
+            pg_version: ${{ vars.pg16_version }}
+            suite: regress
+            image_name: ${{ vars.fail_test_image_name }}
     runs-on: ubuntu-latest
     container:
       image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ vars.image_suffix }}"
@@ -183,18 +205,6 @@ jobs:
       with:
         flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }}
         codecov_token: ${{ secrets.CODECOV_TOKEN }}
-  prepare_parallelization_matrix_6:
-    name: Parallel 6
-    runs-on: ubuntu-latest
-    needs: build
-    outputs:
-      json: ${{ steps.parallelization.outputs.json }}
-    steps:
-      - uses: actions/checkout@v3.5.0
-      - uses: "./.github/actions/parallelization"
-        id: parallelization
-        with:
-          count: 6
   test-arbitrary-configs:
     name: PG${{ matrix.pg_version }} - regress - check-arbitrary-configs
     runs-on: ubuntu-latest #-16core - we need 16 cores VMs to run this job successfully
@@ -203,7 +213,6 @@ jobs:
       options: --user root
     needs:
       - build
-      - prepare_parallelization_matrix_6
     strategy:
       fail-fast: false
       matrix:
@@ -212,7 +221,8 @@ jobs:
         pg_version:
           - ${{ vars.pg14_version }}
           - ${{ vars.pg15_version }}
-        parallel: [1,2,3,4,5,6]
+          - ${{ vars.pg16_version }}
+        parallel: [1,2,3,4,5,6] # workaround for running 6 parallel jobs
     steps:
     - uses: actions/checkout@v3.5.0
     - uses: "./.github/actions/setup_extension"
@@ -234,15 +244,26 @@ jobs:
         flags: ${{ env.pg_major }}_upgrade
         codecov_token: ${{ secrets.CODECOV_TOKEN }}
   test-pg-upgrade:
+    name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - regress - check-pg-upgrade
     runs-on: ubuntu-latest
     container:
       image: "${{ vars.pgupgrade_image_name }}:${{ vars.upgrade_pg_versions }}${{ vars.image_suffix }}"
       options: --user root
     needs:
     - build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - old_pg_major: 14
+            new_pg_major: 15
+          - old_pg_major: 15
+            new_pg_major: 16
+          - old_pg_major: 14
+            new_pg_major: 16
     env:
-      old_pg_major: 14
-      new_pg_major: 15
+      old_pg_major: ${{ matrix.old_pg_major }}
+      new_pg_major: ${{ matrix.new_pg_major }}
     steps:
     - uses: actions/checkout@v3.5.0
     - uses: actions/download-artifact@v3.0.1
@@ -278,7 +299,7 @@ jobs:
   test-citus-upgrade:
     runs-on: ubuntu-latest
     container:
-      image: "${{ vars.citusupgrade_image_name }}:${{ vars.pg14_version }}${{ vars.image_suffix }}"
+      image: "${{ vars.citusupgrade_image_name }}:${{ vars.pg16_version }}${{ vars.image_suffix }}"
       options: --user root
     needs:
     - build
@@ -324,7 +345,7 @@ jobs:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     runs-on: ubuntu-latest
     container:
-      image: ${{ vars.test_image_name }}:${{ vars.pg15_version }}${{ vars.image_suffix }}
+      image: ${{ vars.test_image_name }}:${{ vars.pg16_version }}${{ vars.image_suffix }}
     needs:
       - test-citus
       - test-arbitrary-configs
@@ -417,7 +438,7 @@ jobs:
     name: Test flakyness
     runs-on: ubuntu-latest
     container:
-      image: ${{ vars.fail_test_image_name }}:${{ vars.pg15_version }}${{ vars.image_suffix }}
+      image: ${{ vars.fail_test_image_name }}:${{ vars.pg16_version }}${{ vars.image_suffix }}
       options: --user root
     env:
       runs: 8