From c3446fbdbd560938674ffd091955cc11583e8c50 Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Tue, 31 Oct 2023 15:32:21 +0300
Subject: [PATCH] Adjust test-citus

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

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 5e9a67e9e..0651c8988 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -131,21 +131,17 @@ jobs:
           - ${{ needs.params.outputs.pg12_version }}
           - ${{ needs.params.outputs.pg13_version }}
         make:
-          - check-split
           - check-multi
-          - check-multi-1
           - check-multi-mx
           - check-vanilla
           - check-isolation
+          - check-worker
           - check-operations
           - check-follower-cluster
+
           - check-columnar
           - check-columnar-isolation
-          - check-enterprise
-          - check-enterprise-isolation
-          - check-enterprise-isolation-logicalrep-1
-          - check-enterprise-isolation-logicalrep-2
-          - check-enterprise-isolation-logicalrep-3
+
         include:
           - make: check-failure
             pg_version: ${{ needs.params.outputs.pg11_version }}
@@ -159,50 +155,27 @@ jobs:
             pg_version: ${{ needs.params.outputs.pg13_version }}
             suite: regress
             image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-enterprise-failure
-            pg_version: ${{ needs.params.outputs.pg11_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-enterprise-failure
-            pg_version: ${{ needs.params.outputs.pg12_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-enterprise-failure
-            pg_version: ${{ needs.params.outputs.pg13_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-pytest
-            pg_version: ${{ needs.params.outputs.pg11_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-pytest
-            pg_version: ${{ needs.params.outputs.pg12_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-pytest
-            pg_version: ${{ needs.params.outputs.pg13_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
           - make: installcheck
-            suite: cdc
+            suite: recovery
             image_name: ${{ needs.params.outputs.test_image_name }}
             pg_version: ${{ needs.params.outputs.pg12_version }}
           - make: installcheck
-            suite: cdc
+            suite: recovery
             image_name: ${{ needs.params.outputs.test_image_name }}
             pg_version: ${{ needs.params.outputs.pg13_version }}
-          - make: check-query-generator
-            pg_version: ${{ needs.params.outputs.pg11_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-query-generator
+          - make: installcheck
+            suite: columnar_freezing
+            image_name: ${{ needs.params.outputs.test_image_name }}
             pg_version: ${{ needs.params.outputs.pg12_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-query-generator
+          - make: installcheck
+            suite: columnar_freezing
+            image_name: ${{ needs.params.outputs.test_image_name }}
             pg_version: ${{ needs.params.outputs.pg13_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
+        exclude:
+          - make: check-columnar
+            pg_version: ${{ needs.params.outputs.pg11_version }}
+          - make: check-columnar-isolation
+            pg_version: ${{ needs.params.outputs.pg11_version }}
     runs-on: ubuntu-20.04
     container:
       image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ needs.params.outputs.image_suffix }}"