From 59dbf061539e35c64c57b544f8c678fff7dc2dd6 Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Thu, 17 Aug 2023 15:31:19 +0300
Subject: [PATCH] cdc and tap tests

---
 .github/actions/upload_coverage/action.yml |  3 -
 .github/workflows/build_and_test.yml       | 93 ++++++++--------------
 2 files changed, 32 insertions(+), 64 deletions(-)

diff --git a/.github/actions/upload_coverage/action.yml b/.github/actions/upload_coverage/action.yml
index 3fefc102b..8b50a96a4 100644
--- a/.github/actions/upload_coverage/action.yml
+++ b/.github/actions/upload_coverage/action.yml
@@ -13,9 +13,6 @@ runs:
       lcov --remove lcov.info -o lcov.info '/usr/*'
       sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
       mkdir -p /tmp/codeclimate
-      # We started getting permissions error. This fixes them and since
-      # weqre not on a multi-user system so this is safe to do.
-      git config --global --add safe.directory /home/circleci/project
       cc-test-reporter format-coverage -t lcov -o /tmp/codeclimate/${{ github.job }}.json lcov.info
     shell: bash
   - uses: actions/upload-artifact@v3.1.1
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 02dd8dc40..d068cf1b0 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -115,15 +115,15 @@ jobs:
         path: |-
           ./build-${{ env.PG_MAJOR }}/*
           ./install-${{ env.PG_MAJOR }}.tar
-  test-citus-exttester:
-    name: Test ${{ matrix.make }} PG${{ matrix.pg_version }}
+  test-citus:
+    name: PG${{ matrix.pg_version }} - ${{ matrix.suite }} ${{ matrix.make }}
     strategy:
       fail-fast: false
       matrix:
+        suite:
+          - regress
         image_name:
           - "citus/exttester"
-        image_suffix:
-          - ${{ inputs.image_suffix}}
         pg_version:
           - ${{ inputs.pg14_version }}
           - ${{ inputs.pg15_version }}
@@ -145,18 +145,36 @@ jobs:
           - check-enterprise-isolation-logicalrep-3
         include:
           - make: check-failure
-            image_name: "citus/failtester"
-            pg_version:
-              - ${{ inputs.pg14_version }}
-              - ${{ inputs.pg15_version }}
-          - make: check-enterprise-failure
-            image_name: "citus/failtester"
             pg_version: ${{ inputs.pg14_version }}
-          - make: check-pytest
+            suite: regress
             image_name: "citus/failtester"
+          - make: check-failure
+            pg_version: ${{ inputs.pg15_version }}
+            suite: regress
+            image_name: "citus/failtester"
+          - make: check-enterprise-failure
+            pg_version: ${{ inputs.pg14_version }}
+            suite: regress
+            image_name: "citus/failtester"
+          - make: check-enterprise-failure
+            pg_version: ${{ inputs.pg15_version }}
+            suite: regress
+            image_name: "citus/failtester"
+          - make: check-pytest
+            pg_version: ${{ inputs.pg14_version }}
+            suite: regress
+            image_name: "citus/failtester"
+          - make: check-pytest
+            pg_version: ${{ inputs.pg15_version }}
+            suite: regress
+            image_name: "citus/failtester"
+          - make: installcheck
+            suite: cdc
+            image_name: "citus/exttester"
+            pg_version: ${{ inputs.pg15_version }}
     runs-on: ubuntu-latest
     container:
-      image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ matrix.image_suffix }}"
+      image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ inputs.image_suffix }}"
       options: --user root
     needs:
     - build
@@ -172,7 +190,7 @@ jobs:
     - uses: "./.github/actions/configure"
     - uses: "./.github/actions/enable_core"
     - name: Run Test
-      run: gosu circleci make -C src/test/regress ${{ matrix.make }}
+      run: gosu circleci make -C src/test/${{ matrix.suite }} ${{ matrix.make }}
     - uses: "./.github/actions/save_logs_and_results"
       if: always()
       with:
@@ -186,51 +204,8 @@ jobs:
     - uses: "./.github/actions/upload_coverage"
       if: always()
       with:
-        flags: test_${{ env.PG_MAJOR }},${{ matrix.make }}
+        flags: test_${{ env.PG_MAJOR }},${{ matrix.suite }}_${{ matrix.make }}
 
-  # - check-failure
-  # - check-arbitrary-configs
-  # - check-query-generator
-
-
-
-
-  # tap-test-citus:
-
-  #   defaults:
-  #     run:
-  #       working-directory: "/home/circleci/project"
-  #   runs-on: ubuntu-latest
-  #   container:
-  #     image: "${{ env.image }}"
-  #   needs:
-  #   - build-15
-  #   env:
-  #     pg_major: 15
-  #     image: citus/exttester
-  #     image_tag: "${{ inputs.pg15_version }}"
-  #     suite: cdc
-  #     make: installcheck
-  #   steps:
-  #   - uses: actions/checkout@v3.5.0
-  #   - uses: actions/download-artifact@v3.0.1
-  #     with:
-  #       path: "."
-  #   - uses: "./.github/actions/install_extension"
-  #     with:
-  #       pg_major: "${{ env.pg_major }}"
-  #   - uses: "./.github/actions/configure"
-  #   - uses: "./.github/actions/enable_core"
-  #   - name: Run Test
-  #     run: gosu circleci make -C src/test/${{ env.suite }} ${{ env.make }}
-  #   - uses: actions/upload-artifact@v3.1.1
-  #     with:
-  #       path: "/home/circleci/project/src/test/${{ env.suite }}/tmp_check/log"
-  #   - uses: "./.github/actions/save_logs_and_results"
-  #   - uses: "./.github/actions/stack_trace"
-  #   - uses: "./.github/actions/upload_coverage"
-  #     with:
-  #       flags: test_${{ env.pg_major }},tap_${{ env.suite }}_${{ env.make }}
   # test-arbitrary-configs:
 
   #   defaults:
@@ -655,10 +630,6 @@ jobs:
   #         chmod +x run_hammerdb.sh
   #         run_hammerdb.sh citusbot_tpcc_benchmark_rg
   # test-flakyness:
-  #   if: ${{ inputs.skip_flaky_tests }}
-  #   defaults:
-  #     run:
-  #       working-directory: "/home/circleci/project"
   #   runs-on: ubuntu-latest
   #   container:
   #     image: "${{ env.image }}"