Merge 3007.x into master

s0undt3ch · May 23, 2024 · 3c9e2a7 · 3c9e2a7
2 parents 8743551 + 55f9962
commit 3c9e2a7
Show file tree

Hide file tree

Showing 59 changed files with 29,129 additions and 34,833 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2088,8 +2088,8 @@ jobs:
 
 
  - name: Merge All Code Coverage Test Run Artifacts
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
- id: merge-coverage-artifacts
  with:
  name: all-testrun-coverage-artifacts
  pattern: all-testrun-coverage-artifacts-*

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -2153,8 +2153,8 @@ jobs:
 
 
  - name: Merge All Code Coverage Test Run Artifacts
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
- id: merge-coverage-artifacts
  with:
  name: all-testrun-coverage-artifacts
  pattern: all-testrun-coverage-artifacts-*
@@ -2770,7 +2770,7 @@ jobs:
  - name: Upload Repository As An Artifact
  uses: ./.github/actions/upload-artifact
  with:
- name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo
+ name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo-windows
  path: artifacts/pkgs/repo/*
  retention-days: 7
  if-no-files-found: error

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -363,7 +363,7 @@ jobs:
  branch: ${{ github.ref }}
 
  - name: Create Github Release
- uses: ncipollo/release-action@v1.12.0
+ uses: ncipollo/release-action@v1
  with:
  artifactErrorsFailBuild: true
  artifacts: ${{ steps.prepare-release.outputs.release-artifacts }}

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -2135,8 +2135,8 @@ jobs:
 
 
  - name: Merge All Code Coverage Test Run Artifacts
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
- id: merge-coverage-artifacts
  with:
  name: all-testrun-coverage-artifacts
  pattern: all-testrun-coverage-artifacts-*

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -2595,7 +2595,7 @@ jobs:
  - name: Upload Repository As An Artifact
  uses: ./.github/actions/upload-artifact
  with:
- name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo
+ name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo-windows
  path: artifacts/pkgs/repo/*
  retention-days: 7
  if-no-files-found: error

diff --git a/.github/workflows/templates/build-windows-repo.yml.jinja b/.github/workflows/templates/build-windows-repo.yml.jinja
@@ -85,7 +85,7 @@
  - name: Upload Repository As An Artifact
  uses: ./.github/actions/upload-artifact
  with:
- name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo
+ name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo-windows
  path: artifacts/pkgs/repo/*
  retention-days: 7
  if-no-files-found: error

diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
@@ -348,8 +348,8 @@
 #}
 
  - name: Merge All Code Coverage Test Run Artifacts
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
- id: merge-coverage-artifacts
  with:
  name: all-testrun-coverage-artifacts
  pattern: all-testrun-coverage-artifacts-*

diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja
@@ -372,7 +372,7 @@ permissions:
  branch: ${{ github.ref }}
 
  - name: Create Github Release
- uses: ncipollo/release-action@v1.12.0
+ uses: ncipollo/release-action@v1
  with:
  artifactErrorsFailBuild: true
  artifacts: ${{ steps.prepare-release.outputs.release-artifacts }}

diff --git a/.github/workflows/test-action-linux.yml b/.github/workflows/test-action-linux.yml
@@ -127,6 +127,11 @@ jobs:
  run: |
  t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
 
+ - name: "Set `TIMESTAMP` environment variable"
+ shell: bash
+ run: |
+ echo "TIMESTAMP=$(date +%s)" | tee -a "$GITHUB_ENV"
+
  - name: Checkout Source Code
  uses: actions/checkout@v4
 
@@ -275,29 +280,29 @@ jobs:
  if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}
+ name: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/coverage/
 
  - name: Upload JUnit XML Test Run Artifacts
  if: always() && steps.download-artifacts-from-vm.outcome == 'success'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}
+ name: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/xml-unittests-output/
 
  - name: Upload Test Run Log Artifacts
  if: always() && steps.download-artifacts-from-vm.outcome == 'success'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}
+ name: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/logs
 
  report:
  name: Test Reports
- if: always() && fromJSON(needs.generate-matrix.outputs.build-reports) && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ if: always() && fromJSON(needs.generate-matrix.outputs.build-reports) && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
  runs-on: ubuntu-latest
  needs:
  - test
@@ -313,6 +318,8 @@ jobs:
  t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
  - name: Merge JUnit XML Test Run Artifacts
+ if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
@@ -321,6 +328,8 @@ jobs:
  delete-merged: true
 
  - name: Merge Log Test Run Artifacts
+ if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
@@ -329,9 +338,9 @@ jobs:
  delete-merged: true
 
  - name: Merge Code Coverage Test Run Artifacts
- uses: actions/upload-artifact/merge@v4
  if: ${{ inputs.skip-code-coverage == false }}
- id: merge-coverage-artifacts
+ continue-on-error: true
+ uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
  pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-*
@@ -347,6 +356,7 @@ jobs:
  path: artifacts/coverage/
 
  - name: Show Downloaded Test Run Artifacts
+ if: ${{ inputs.skip-code-coverage == false }}
  run: |
  tree -a artifacts
 

diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml
@@ -120,6 +120,11 @@ jobs:
  run: |
  t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
 
+ - name: "Set `TIMESTAMP` environment variable"
+ shell: bash
+ run: |
+ echo "TIMESTAMP=$(date +%s)" | tee -a "$GITHUB_ENV"
+
  - name: Checkout Source Code
  uses: actions/checkout@v4
 
@@ -303,29 +308,29 @@ jobs:
  if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}
+ name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/coverage/
 
  - name: Upload JUnit XML Test Run Artifacts
  if: always() && steps.download-artifacts-from-vm.outcome == 'success'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}
+ name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/xml-unittests-output/
 
  - name: Upload Test Run Log Artifacts
  if: always() && steps.download-artifacts-from-vm.outcome == 'success'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}
+ name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/logs
 
  report:
  name: Test Reports
- if: always() && fromJSON(needs.generate-matrix.outputs.build-reports) && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ if: always() && fromJSON(needs.generate-matrix.outputs.build-reports) && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
  runs-on: ubuntu-latest
  needs:
  - test
@@ -341,28 +346,32 @@ jobs:
  t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
  - name: Merge JUnit XML Test Run Artifacts
+ if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
- pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+ pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
  separate-directories: false
  delete-merged: true
 
  - name: Merge Log Test Run Artifacts
+ if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
- pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+ pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
  separate-directories: false
  delete-merged: true
 
  - name: Merge Code Coverage Test Run Artifacts
- uses: actions/upload-artifact/merge@v4
  if: ${{ inputs.skip-code-coverage == false }}
- id: merge-coverage-artifacts
+ continue-on-error: true
+ uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
- pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+ pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
  separate-directories: false
  delete-merged: true
 
@@ -375,6 +384,7 @@ jobs:
  path: artifacts/coverage/
 
  - name: Show Downloaded Test Run Artifacts
+ if: ${{ inputs.skip-code-coverage == false }}
  run: |
  tree -a artifacts
 

diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml
@@ -127,6 +127,11 @@ jobs:
  run: |
  t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
 
+ - name: "Set `TIMESTAMP` environment variable"
+ shell: bash
+ run: |
+ echo "TIMESTAMP=$(date +%s)" | tee -a "$GITHUB_ENV"
+
  - name: Checkout Source Code
  uses: actions/checkout@v4
 
@@ -275,30 +280,30 @@ jobs:
  if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}
+ name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/coverage/
 
  - name: Upload JUnit XML Test Run Artifacts
  if: always() && steps.download-artifacts-from-vm.outcome == 'success'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}
+ name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/xml-unittests-output/
 
  - name: Upload Test Run Log Artifacts
  if: always() && steps.download-artifacts-from-vm.outcome == 'success'
  uses: actions/upload-artifact@v4
  with:
- name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}
+ name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}-${{ env.TIMESTAMP }}
  path: |
  artifacts/logs
 
 
  report:
  name: Test Reports
- if: always() && fromJSON(needs.generate-matrix.outputs.build-reports) && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ if: always() && fromJSON(needs.generate-matrix.outputs.build-reports) && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
  runs-on: ubuntu-latest
  needs:
  - test
@@ -314,28 +319,32 @@ jobs:
  t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
  - name: Merge JUnit XML Test Run Artifacts
+ if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
- pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+ pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
  separate-directories: false
  delete-merged: true
 
  - name: Merge Log Test Run Artifacts
+ if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+ continue-on-error: true
  uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
- pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+ pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
  separate-directories: false
  delete-merged: true
 
  - name: Merge Code Coverage Test Run Artifacts
- uses: actions/upload-artifact/merge@v4
  if: ${{ inputs.skip-code-coverage == false }}
- id: merge-coverage-artifacts
+ continue-on-error: true
+ uses: actions/upload-artifact/merge@v4
  with:
  name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
- pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+ pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
  separate-directories: false
  delete-merged: true
 
@@ -348,6 +357,7 @@ jobs:
  path: artifacts/coverage/
 
  - name: Show Downloaded Test Run Artifacts
+ if: ${{ inputs.skip-code-coverage == false }}
  run: |
  tree -a artifacts