From 28b06848152e1dbf5f34f4f961c2c953c9ab22e1 Mon Sep 17 00:00:00 2001
From: Yuri Bocharov <mail@yuribocharov.dev>
Date: Tue, 21 May 2024 16:20:46 -0400
Subject: [PATCH] feat: more parallel test changes (#5730)

If statements were incorrect on main branch,
updated with corrections (was not passing secrets
in when they were needed).

Removed code climate from parallel tests
---
 .github/workflows/combine_and_report.yml | 11 +++++++----
 .github/workflows/rspec_parallel.yml     | 17 ++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/combine_and_report.yml b/.github/workflows/combine_and_report.yml
index d72f77836a..60f68c3116 100644
--- a/.github/workflows/combine_and_report.yml
+++ b/.github/workflows/combine_and_report.yml
@@ -3,6 +3,10 @@ on:
 jobs:
   combine_and_report:
     runs-on: ubuntu-latest
+    env:
+      AZURE_STORAGE_KEY: ${{ secrets.STORAGE_ACCESS_KEY }}
+      AZURE_STORAGE_ACCOUNT: ${{ secrets.ACCOUNT_NAME }}
+      STORAGE_CONTAINER: ${{ secrets.STORAGE_CONTAINER }}
     steps:
       - name: Checkout Project
         uses: actions/checkout@v4
@@ -10,19 +14,18 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: artifacts
+
       - name: Decompress chunk test reports
         run: |
           find artifacts -name "test_reports*.zip" -exec unzip -d test_reports {} \;
           find test_reports -name "**/test_reports*.zip" -exec unzip -d test_reports {} \;
+
       - name: Merge parallel runtime log parts
         if: env.AZURE_STORAGE_KEY != ''
         run: |
           cat artifacts/**/parallel_runtime_rspec*.log > parallel_runtime.log
+
       - name: Upload log file to Azure Blob Storage
-        env:
-          AZURE_STORAGE_KEY: ${{ secrets.STORAGE_ACCESS_KEY }}
-          AZURE_STORAGE_ACCOUNT: ${{ secrets.ACCOUNT_NAME }}
-          STORAGE_CONTAINER: ${{ secrets.STORAGE_CONTAINER }}
         if: env.AZURE_STORAGE_KEY != ''
         run: |
           az storage blob upload \
diff --git a/.github/workflows/rspec_parallel.yml b/.github/workflows/rspec_parallel.yml
index e706cc6952..ca99c34e3a 100644
--- a/.github/workflows/rspec_parallel.yml
+++ b/.github/workflows/rspec_parallel.yml
@@ -26,6 +26,9 @@ jobs:
       BUNDLE_WITHOUT: "development"
       CI_TOTAL_JOBS: ${{ inputs.group_count }}
       CI_JOB_INDEX: ${{ inputs.groups }}
+      AZURE_STORAGE_KEY: ${{ secrets.STORAGE_ACCESS_KEY }}
+      AZURE_STORAGE_ACCOUNT: ${{ secrets.ACCOUNT_NAME }}
+      STORAGE_CONTAINER: ${{ secrets.STORAGE_CONTAINER }}
     services:
       db:
         image: postgres:14.8
@@ -42,10 +45,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download parallel runtime log from Azure Blob Storage
-        env:
-          AZURE_STORAGE_KEY: ${{ secrets.STORAGE_ACCESS_KEY }}
-          AZURE_STORAGE_ACCOUNT: ${{ secrets.ACCOUNT_NAME }}
-          STORAGE_CONTAINER: ${{ secrets.STORAGE_CONTAINER }}
         if: env.AZURE_STORAGE_KEY != ''
         run: |
           az storage blob download \
@@ -104,9 +103,9 @@ jobs:
           CC_TEST_REPORTER_ID: 31464536e34ab26588cb951d0fa6b5898abdf401dbe912fd47274df298e432ac
         continue-on-error: true
         run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
+          # curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          # chmod +x ./cc-test-reporter
+          # ./cc-test-reporter before-build
 
           RUBYOPT='-W:no-deprecated -W:no-experimental' bundle exec parallel_rspec \
           -n "${CI_TOTAL_JOBS}" \
@@ -114,8 +113,8 @@ jobs:
           --runtime-log old_parallel_runtime.log \
           --verbose ./spec
 
-          echo 'Tests completed. Uploading to Code Climate'
-          ./cc-test-reporter after-build --exit-code $?
+          # echo 'Tests completed. Uploading to Code Climate'
+          # ./cc-test-reporter after-build --exit-code $?
           cat tmp/spec_summary.log
 
       - name: Compress reports