From 3ea8b9fb77ca61b85cb5fdd6c19de10fe5eef365 Mon Sep 17 00:00:00 2001
From: Eugen C <1533818+armab@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:58:14 +0100
Subject: [PATCH 1/2] Remove unused codecov for Orquesta integration tests

---
 .github/workflows/orquesta-integration-tests.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index dabfa417f4..b45dd5fb84 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -106,7 +106,6 @@ jobs:
 
     env:
       TASK: '${{ matrix.task }}'
-      PYTHON_VERSION_SHORT: '${{ matrix.python-version-short }}'
       NODE_TOTAL: '${{ matrix.nosetests_node_total }}'
       NODE_INDEX: '${{ matrix.nosetests_node_index }}'
 
@@ -224,13 +223,6 @@ jobs:
         with:
           name: logs
           path: logs/
-      - name: Codecov
-        # NOTE: We only generate and submit coverage report for master and version branches and only when the build succeeds (default on GitHub Actions, this was not the case on Travis so we had to explicitly check success)
-        if: "${{ success() && (env.ENABLE_COVERAGE == 'yes') && (env.PYTHON_VERSION_SHORT == '3.8')}}"
-        run: |
-          ./scripts/ci/submit-codecov-coverage.sh
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       - name: Compress Service Logs Before upload
         if: ${{ failure() }}
         run: |

From a2a446c5a6b34a7fb976cb5c678d6522a79af7fc Mon Sep 17 00:00:00 2001
From: Eugen C <1533818+armab@users.noreply.github.com>
Date: Tue, 24 Oct 2023 15:10:56 +0100
Subject: [PATCH 2/2] Update the Changelog for #6048

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 26992cade6..a319356872 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,7 +20,7 @@ Fixed
 
 * Avoid logging sensitive information in debug (fix #5977)
 
-* Fix codecov for intergration and unit tests stackstorm/st2 (#6035 and #6046)
+* Fix codecov failures for stackstorm/st2 tests. #6035, #6046, #6048
 
 Added
 ~~~~~