From 0af5f401c9bc3ba47b93625340b78fda1fffdd7f Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Mon, 21 Aug 2023 15:49:41 +0300
Subject: [PATCH] Minor updates

---
 .github/workflows/build_and_test.yml | 39 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 72433e2d5..044625495 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -299,6 +299,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3.5.0
     - uses: actions/download-artifact@v3.0.1
+      with:
+        name: build-${{ inputs.pg14_version }}
     - name: Install and test citus upgrade
       run: |-
         chown -R circleci .
@@ -311,8 +313,8 @@ jobs:
               check-citus-upgrade \
               bindir=/usr/lib/postgresql/${PG_MAJOR}/bin \
               citus-old-version=${citus_version} \
-              citus-pre-tar=install-pg${PG_MAJOR}-citus${citus_version}.tar \
-              citus-post-tar=install-$PG_MAJOR.tar; \
+              citus-pre-tar=../../../install-pg${PG_MAJOR}-citus${citus_version}.tar \
+              citus-post-tar=../../../install-$PG_MAJOR.tar; \
         done;
         # run make check-citus-upgrade-mixed for all citus versions
         # the image has ${CITUS_VERSIONS} set with all verions it contains the binaries of
@@ -322,8 +324,8 @@ jobs:
               check-citus-upgrade-mixed \
               citus-old-version=${citus_version} \
               bindir=/usr/lib/postgresql/${PG_MAJOR}/bin \
-              citus-pre-tar=install-pg${PG_MAJOR}-citus${citus_version}.tar \
-              citus-post-tar=install-$PG_MAJOR.tar; \
+              citus-pre-tar=../../../install-pg${PG_MAJOR}-citus${citus_version}.tar \
+              citus-post-tar=../../../install-$PG_MAJOR.tar; \
         done;
     - uses: "./.github/actions/save_logs_and_results"
     - uses: "./.github/actions/upload_coverage"
@@ -393,9 +395,23 @@ jobs:
           cd ./src/test/hammerdb
           chmod +x run_hammerdb.sh
           run_hammerdb.sh citusbot_tpcc_benchmark_rg
+  prepare_parallelization_matrix_32:
+    name: Parallel 32
+    if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
+    needs: test-flakyness-pre
+    runs-on: ubuntu-latest
+    outputs:
+      json: ${{ steps.parallelization.outputs.json }}
+    steps:
+      - uses: actions/checkout@v3.5.0
+      - uses: "./.github/actions/parallelization"
+        id: parallelization
+        with:
+          count: 32
   test-flakyness-pre:
     name: Detect regression tests need to be ran
     runs-on: ubuntu-latest
+    needs: build
     outputs:
       tests: ${{ steps.detect-regression-tests.outputs.tests }}
     steps:
@@ -412,20 +428,7 @@ jobs:
         else
           echo "Detected tests " $tests
         fi
-        echo tests=\""$tests"\" >> "$GITHUB_OUTPUT"
-  prepare_parallelization_matrix_32:
-    name: Parallel 32
-    if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
-    needs: test-flakyness-pre
-    runs-on: ubuntu-latest
-    outputs:
-      json: ${{ steps.parallelization.outputs.json }}
-    steps:
-      - uses: actions/checkout@v3.5.0
-      - uses: "./.github/actions/parallelization"
-        id: parallelization
-        with:
-          count: 32
+        echo tests="$tests" >> "$GITHUB_OUTPUT"
   test-flakyness:
     if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
     name: Test flakyness