From 16d03c9a1998a31bf4982edfb71597ba3b089385 Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Fri, 18 Aug 2023 13:47:07 +0300
Subject: [PATCH] Cleanup

---
 .github/actions/install_extension/action.yml  |  7 ++++
 .../actions/save_logs_and_results/action.yml  |  3 +-
 .github/workflows/flaky_test_debugging.yml    | 39 +------------------
 3 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/.github/actions/install_extension/action.yml b/.github/actions/install_extension/action.yml
index 2d7c0b965..8557b8bc3 100644
--- a/.github/actions/install_extension/action.yml
+++ b/.github/actions/install_extension/action.yml
@@ -2,6 +2,13 @@ name: install_extension
 runs:
   using: composite
   steps:
+  - uses: actions/checkout@v3.5.0
+  - name: Expose $PG_MAJOR to Github Env
+    run: echo "PG_MAJOR=${PG_MAJOR}" >> $GITHUB_ENV
+    shell: bash
+  - uses: actions/download-artifact@v3.0.1
+    with:
+      name: build-${{ env.PG_MAJOR }}
   - name: Install Extension
     run: tar xfv "install-$PG_MAJOR.tar" --directory /
     shell: bash
diff --git a/.github/actions/save_logs_and_results/action.yml b/.github/actions/save_logs_and_results/action.yml
index 32f16c07b..7c7f5114c 100644
--- a/.github/actions/save_logs_and_results/action.yml
+++ b/.github/actions/save_logs_and_results/action.yml
@@ -17,7 +17,8 @@ runs:
         src/test/**/tmp_check/master/log
         src/test/**/tmp_check/worker.57638/log
         src/test/**/tmp_check/worker.57637/log
-        src/test/**/regression.diffs
+        src/test/**/*.diffs
+        src/test/**/logfile_*
   - name: Publish regression.diffs
     run: |-
       if [ -f "src/test/regress/regression.diffs" ]; then
diff --git a/.github/workflows/flaky_test_debugging.yml b/.github/workflows/flaky_test_debugging.yml
index ef4aa80ed..0468701d9 100644
--- a/.github/workflows/flaky_test_debugging.yml
+++ b/.github/workflows/flaky_test_debugging.yml
@@ -71,7 +71,6 @@ jobs:
           count: ${{ inputs.flaky_test_parallel_jobs }}
   test_flakyness:
     name: Test flakyness
-    if: ${{ inputs.flaky_test }}
     runs-on: ubuntu-latest
     container:
       image: ${{ needs.set_image_names.outputs.test_image }}
@@ -86,48 +85,12 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.prepare_parallelization_matrix.outputs.json) }}
     steps:
-    - uses: actions/checkout@v3.5.0
-    - name: Expose $PG_MAJOR to Github Env
-      run: echo "PG_MAJOR=${PG_MAJOR}" >> $GITHUB_ENV
-      shell: bash
-    - uses: actions/download-artifact@v3.0.1
-      with:
-        name: build-${{ env.PG_MAJOR }}
-    - name: Detect regression tests need to be ran
-      id: detect-regression-tests
-      run: |-
-        testForDebugging="${{ env.test }}"
-        if [ -z "$testForDebugging" ]; then
-          detected_changes=$(git diff origin/main... --name-only --diff-filter=AM | (grep 'src/test/regress/sql/.*\.sql\|src/test/regress/spec/.*\.spec\|src/test/regress/citus_tests/test/test_.*\.py' || true))
-          tests=${detected_changes}
-        else
-          tests=$testForDebugging;
-        fi
-        if [ -z "$tests" ]; then
-            echo "No test found."
-            gh run cancel ${{ github.run_id }}
-            gh run watch ${{ github.run_id }}
-        else
-          echo "Detected tests " $tests
-        fi
-        echo "tests=$tests" >> "$GITHUB_OUTPUT"
     - uses: "./.github/actions/install_extension"
     - name: Run minimal tests
       run: |-
-        tests_array=(${{ steps.detect-regression-tests.outputs.tests }})
-        for test in "${tests_array[@]}"
-        do
-            test_name=$(echo "$test" | sed -r "s/.+\/(.+)\..+/\1/")
-            gosu circleci src/test/regress/citus_tests/run_test.py $test_name --repeat ${{ env.runs }} --use-base-schedule --use-whole-schedule-line
-        done
+          gosu circleci src/test/regress/citus_tests/run_test.py ${{ env.test }} --repeat ${{ env.runs }} --use-base-schedule --use-whole-schedule-line
       shell: bash
     - uses: "./.github/actions/save_logs_and_results"
       if: always()
       with:
           folder: ${{ matrix.id }}
-    - uses: "./.github/actions/save_regressions"
-      if: always()
-      with:
-          folder: ${{ matrix.id }}
-    - uses: "./.github/actions/stack_trace"
-      if: always()