SNOW-2021009: Improving CICD, flakiness fixes (#2569)

(cherry picked from commit cfa0ad8)

Author: sfc-gh-pcyrek

.github/workflows/build_test.yml

@@ -19,6 +19,14 @@ on:
             required: true
           tags:
             description: "Test scenario tags"
+            required: false
+            type: string
+
+permissions:
+  contents: read
+  actions: read
+  checks: write
+  pull-requests: write
 
 concurrency:
   # older builds for the same pull request number or branch should be cancelled
@@ -223,7 +231,6 @@ jobs:
        # To run a single test on GHA use the below command:
 #        run: python -m tox run -e `echo py${PYTHON_VERSION/\./}-single-ci | sed 's/ /,/g'`
         run: python -m tox run -e `echo py${PYTHON_VERSION/\./}-{extras,unit-parallel,integ-parallel,pandas-parallel,sso}-ci | sed 's/ /,/g'`
-
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
           cloud_provider: ${{ matrix.cloud-provider }}
@@ -232,17 +239,16 @@ jobs:
          # To specify the test name (in single test mode) pass this env variable:
 #          SINGLE_TEST_NAME: test/path/filename.py::test_name
         shell: bash
-      - name: Combine coverages
-        run: python -m tox run -e coverage --skip-missing-interpreters false
-        shell: bash
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           include-hidden-files: true
           name: coverage_${{ matrix.os.download_name }}-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
           path: |
             .tox/.coverage
             .tox/coverage.xml
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           include-hidden-files: true
           name: junit_${{ matrix.os.download_name }}-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
@@ -370,13 +376,15 @@ jobs:
           TOX_PARALLEL_NO_SPINNER: 1
         shell: bash
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           include-hidden-files: true
           name: coverage_linux-fips-3.9-${{ matrix.cloud-provider }}
           path: |
             .coverage
             coverage.xml
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           include-hidden-files: true
           name: junit_linux-fips-3.9-${{ matrix.cloud-provider }}
@@ -432,13 +440,15 @@ jobs:
           TOX_PARALLEL_NO_SPINNER: 1
         shell: bash
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           include-hidden-files: true
           name: coverage_linux-lambda-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
           path: |
             .coverage.py${{ env.shortver }}-lambda-ci
             junit.py${{ env.shortver }}-lambda-ci-dev.xml
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           include-hidden-files: true
           name: junit_linux-lambda-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
@@ -555,7 +565,7 @@ jobs:
         shell: bash
 
   combine-coverage:
-    if: ${{ success() || failure() }}
+    if: always()
     name: Combine coverage
     needs: [lint, test, test-fips, test-lambda, test-aio]
     runs-on: ubuntu-latest
@@ -587,6 +597,7 @@ jobs:
               dst_file = dst_dir / ".coverage.{}".format(src_file.parent.name[9:])
               print("{} copy to {}".format(src_file, dst_file))
               shutil.copy(str(src_file), str(dst_file))'
+
       - name: Collect all JUnit XML files to one dir
         run: |
           python -c '
@@ -596,33 +607,43 @@ jobs:
           src_dir = Path("artifacts")
           dst_dir = Path(".") / "junit_results"
           dst_dir.mkdir()
-          # Collect all JUnit XML files with different naming patterns
-          for pattern in ["*/junit.*.xml", "*/junit.py*-lambda-ci-dev.xml"]:
-              for src_file in src_dir.glob(pattern):
-                  dst_file = dst_dir / src_file.name
-                  print("{} copy to {}".format(src_file, dst_file))
-                  shutil.copy(str(src_file), str(dst_file))'
+          for src_file in src_dir.glob("*/junit*.xml"):
+              artifact_name = src_file.parent.name
+              dst_file = dst_dir / f"{artifact_name}_{src_file.name}"
+              print("{} copy to {}".format(src_file, dst_file))
+              shutil.copy(str(src_file), str(dst_file))'
       - name: Combine coverages
-        run: python -m tox run -e coverage
+        run: |
+          if [ -d ".tox" ] && [ "$(find .tox -name ".coverage*" -type f | wc -l)" -gt 0 ]; then
+            python -m tox run -e coverage
+          else
+            echo "No coverage files found, skipping coverage combination"
+          fi
       - name: Publish html coverage
+        if: ${{ success() }}
         uses: actions/upload-artifact@v4
         with:
           include-hidden-files: true
           name: overall_cov_html
           path: .tox/htmlcov
       - name: Publish xml coverage
+        if: ${{ success() }}
         uses: actions/upload-artifact@v4
         with:
           include-hidden-files: true
           name: overall_cov_xml
           path: .tox/coverage.xml
       - uses: codecov/codecov-action@v4
+        if: ${{ success() }}
         with:
           files: .tox/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
+          name: coverage-${{ github.run_id }}
+          fail_ci_if_error: false
+          verbose: true
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/test-results-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: junit_results/junit.*.xml
+          files: junit_results/*.xml

tox.ini

@@ -188,7 +188,7 @@ depends = py39, py310, py311, py312, py313
 [pytest]
 log_level = info
 addopts = -ra --strict-markers
-junit_family = legacy
+junit_family = xunit2
 filterwarnings =
     error::UserWarning:cryptography.*
     error::cryptography.utils.CryptographyDeprecationWarning