Merge branch '3006.x' into test_batch_9

cmcmarrow · Oct 18, 2023 · 2edd9c7 · 2edd9c7
2 parents 232d68b + 4f2be18
commit 2edd9c7
Show file tree

Hide file tree

Showing 39 changed files with 2,821 additions and 1,265 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -58,37 +58,37 @@ flags:
   salt:
     paths:
       - salt/
-    carryforward: true        # https://docs.codecov.io/docs/carryforward-flags
+    carryforward: false       # https://docs.codecov.io/docs/carryforward-flags
   tests:
     paths:
       - tests/
-    carryforward: true
+    carryforward: false
   pkg:
     paths:
       - pkg/tests
-    carryforward: true
+    carryforward: false
   unit:
     paths:
       - tests/unit
       - tests/pytests/unit
-    carryforward: true
+    carryforward: false
   functional:
     paths:
       - tests/pytests/functional
-    carryforward: true
+    carryforward: false
   scenarios:
     paths:
       - tests/pytests/scenarios
-    carryforward: true
+    carryforward: false
   integration:
     paths:
       - tests/integration
       - tests/pytests/integration
-    carryforward: true
+    carryforward: false
 
 comment:
   layout: "reach, diff, flags, files"
-  behavior: default              # Comment posting behaviour
+  behavior: new                  # Comment posting behaviour
                                  #   default: update, if exists. Otherwise post new.
                                  #   once: update, if exists. Otherwise post new. Skip if deleted.
                                  #   new: delete old and post new.
diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml
@@ -121,12 +121,12 @@ jobs:
       - name: Cleanup .nox Directory
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
         run: |
-          nox -e "pre-archive-cleanup(pkg=False)"
+          nox --force-color -e "pre-archive-cleanup(pkg=False)"
 
       - name: Compress .nox Directory
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
         run: |
-          nox -e compress-dependencies -- ${{ inputs.distro-slug }}
+          nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
 
       - name: Upload Nox Requirements Tarball
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2306,6 +2306,10 @@ jobs:
         with:
           python-version: "3.10"
 
+      - name: Setup Python Tools Scripts
+        id: python-tools-scripts
+        uses: ./.github/actions/setup-python-tools-scripts
+
       - name: Install Nox
         run: |
           python3 -m pip install 'nox==2022.8.7'
@@ -2322,6 +2326,28 @@ jobs:
       - name: Display structure of downloaded files
         run: tree -a artifacts/
 
+      - name: Install Codecov CLI
+        run: |
+          # We can't yet use tokenless uploads with the codecov CLI
+          # python3 -m pip install codecov-cli
+          #
+          curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import
+          curl -Os https://uploader.codecov.io/latest/linux/codecov
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+          gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM
+          shasum -a 256 -c codecov.SHA256SUM
+          chmod +x codecov
+          mv ./codecov /usr/local/bin/
+
+      - name: Create XML Coverage Reports
+        run: |
+          nox --force-color -e create-xml-coverage-reports
+
+      - name: Upload Code Coverage To Codecov
+        run: |
+          tools ci upload-coverage --commit-sha=${{ github.event.pull_request.head.sha || github.sha }} artifacts/coverage/
+
       - name: Combine Code Coverage
         run: |
           nox --force-color -e combine-coverage

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -2367,6 +2367,10 @@ jobs:
         with:
           python-version: "3.10"
 
+      - name: Setup Python Tools Scripts
+        id: python-tools-scripts
+        uses: ./.github/actions/setup-python-tools-scripts
+
       - name: Install Nox
         run: |
           python3 -m pip install 'nox==2022.8.7'
@@ -2383,6 +2387,28 @@ jobs:
       - name: Display structure of downloaded files
         run: tree -a artifacts/
 
+      - name: Install Codecov CLI
+        run: |
+          # We can't yet use tokenless uploads with the codecov CLI
+          # python3 -m pip install codecov-cli
+          #
+          curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import
+          curl -Os https://uploader.codecov.io/latest/linux/codecov
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+          gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM
+          shasum -a 256 -c codecov.SHA256SUM
+          chmod +x codecov
+          mv ./codecov /usr/local/bin/
+
+      - name: Create XML Coverage Reports
+        run: |
+          nox --force-color -e create-xml-coverage-reports
+
+      - name: Upload Code Coverage To Codecov
+        run: |
+          tools ci upload-coverage --commit-sha=${{ github.event.pull_request.head.sha || github.sha }} artifacts/coverage/
+
       - name: Combine Code Coverage
         run: |
           nox --force-color -e combine-coverage

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -2340,6 +2340,10 @@ jobs:
         with:
           python-version: "3.10"
 
+      - name: Setup Python Tools Scripts
+        id: python-tools-scripts
+        uses: ./.github/actions/setup-python-tools-scripts
+
       - name: Install Nox
         run: |
           python3 -m pip install 'nox==2022.8.7'
@@ -2356,6 +2360,28 @@ jobs:
       - name: Display structure of downloaded files
         run: tree -a artifacts/
 
+      - name: Install Codecov CLI
+        run: |
+          # We can't yet use tokenless uploads with the codecov CLI
+          # python3 -m pip install codecov-cli
+          #
+          curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import
+          curl -Os https://uploader.codecov.io/latest/linux/codecov
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+          gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM
+          shasum -a 256 -c codecov.SHA256SUM
+          chmod +x codecov
+          mv ./codecov /usr/local/bin/
+
+      - name: Create XML Coverage Reports
+        run: |
+          nox --force-color -e create-xml-coverage-reports
+
+      - name: Upload Code Coverage To Codecov
+        run: |
+          tools ci upload-coverage --commit-sha=${{ github.event.pull_request.head.sha || github.sha }} artifacts/coverage/
+
       - name: Combine Code Coverage
         run: |
           nox --force-color -e combine-coverage

diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
@@ -343,6 +343,10 @@
         with:
           python-version: "3.10"
 
+      - name: Setup Python Tools Scripts
+        id: python-tools-scripts
+        uses: ./.github/actions/setup-python-tools-scripts
+
       - name: Install Nox
         run: |
           python3 -m pip install 'nox==<{ nox_version }>'
@@ -370,6 +374,28 @@
       - name: Display structure of downloaded files
         run: tree -a artifacts/
 
+      - name: Install Codecov CLI
+        run: |
+          # We can't yet use tokenless uploads with the codecov CLI
+          # python3 -m pip install codecov-cli
+          #
+          curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import
+          curl -Os https://uploader.codecov.io/latest/linux/codecov
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+          curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+          gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM
+          shasum -a 256 -c codecov.SHA256SUM
+          chmod +x codecov
+          mv ./codecov /usr/local/bin/
+
+      - name: Create XML Coverage Reports
+        run: |
+          nox --force-color -e create-xml-coverage-reports
+
+      - name: Upload Code Coverage To Codecov
+        run: |
+          tools ci upload-coverage --commit-sha=${{ github.event.pull_request.head.sha || github.sha }} artifacts/coverage/
+
       - name: Combine Code Coverage
         run: |
           nox --force-color -e combine-coverage