Include x86 in Windows package download tests

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

.github/workflows/release.yml

@@ -711,9 +711,9 @@ jobs:
       skip-code-coverage: true
     secrets: inherit
 
-  windows-2022-nsis-pkg-download-tests:
+  windows-2022-nsis-amd64-pkg-download-tests:
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
-    name: Test Windows 2022 NSIS Package Downloads
+    name: Test Windows 2022 amd64 NSIS Package Downloads
     needs:
       - prepare-workflow
       - publish-repositories
@@ -730,9 +730,9 @@ jobs:
       skip-code-coverage: true
     secrets: inherit
 
-  windows-2022-msi-pkg-download-tests:
+  windows-2022-msi-amd64-pkg-download-tests:
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
-    name: Test Windows 2022 MSI Package Downloads
+    name: Test Windows 2022 amd64 MSI Package Downloads
     needs:
       - prepare-workflow
       - publish-repositories
@@ -749,6 +749,44 @@ jobs:
       skip-code-coverage: true
     secrets: inherit
 
+  windows-2022-nsis-x86-pkg-download-tests:
+    if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
+    name: Test Windows 2022 x86 NSIS Package Downloads
+    needs:
+      - prepare-workflow
+      - publish-repositories
+      - download-onedir-artifact
+    uses: ./.github/workflows/test-package-downloads-action-windows.yml
+    with:
+      distro-slug: windows-2022
+      platform: windows
+      arch: x86
+      pkg-type: NSIS
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      environment: release
+      skip-code-coverage: true
+    secrets: inherit
+
+  windows-2022-msi-x86-pkg-download-tests:
+    if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
+    name: Test Windows 2022 x86 MSI Package Downloads
+    needs:
+      - prepare-workflow
+      - publish-repositories
+      - download-onedir-artifact
+    uses: ./.github/workflows/test-package-downloads-action-windows.yml
+    with:
+      distro-slug: windows-2022
+      platform: windows
+      arch: x86
+      pkg-type: MSI
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      environment: release
+      skip-code-coverage: true
+    secrets: inherit
+
   release:
     name: Release v${{ needs.prepare-workflow.outputs.salt-version }}
     if: ${{ always() && ! failure() && ! cancelled() }}
@@ -788,8 +826,10 @@ jobs:
       - ubuntu-2204-pkg-download-tests
       - ubuntu-2204-arm64-pkg-download-tests
       - macos-12-pkg-download-tests
-      - windows-2022-nsis-pkg-download-tests
-      - windows-2022-msi-pkg-download-tests
+      - windows-2022-nsis-amd64-pkg-download-tests
+      - windows-2022-msi-amd64-pkg-download-tests
+      - windows-2022-nsis-x86-pkg-download-tests
+      - windows-2022-msi-x86-pkg-download-tests
     environment: release
     steps:
       - name: Clone The Salt Repository

.github/workflows/staging.yml

@@ -2560,9 +2560,9 @@ jobs:
       skip-code-coverage: true
     secrets: inherit
 
-  windows-2022-nsis-pkg-download-tests:
+  windows-2022-nsis-amd64-pkg-download-tests:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    name: Test Windows 2022 NSIS Package Downloads
+    name: Test Windows 2022 amd64 NSIS Package Downloads
     needs:
       - prepare-workflow
       - publish-repositories
@@ -2578,9 +2578,9 @@ jobs:
       skip-code-coverage: true
     secrets: inherit
 
-  windows-2022-msi-pkg-download-tests:
+  windows-2022-msi-amd64-pkg-download-tests:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    name: Test Windows 2022 MSI Package Downloads
+    name: Test Windows 2022 amd64 MSI Package Downloads
     needs:
       - prepare-workflow
       - publish-repositories
@@ -2596,6 +2596,42 @@ jobs:
       skip-code-coverage: true
     secrets: inherit
 
+  windows-2022-nsis-x86-pkg-download-tests:
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    name: Test Windows 2022 x86 NSIS Package Downloads
+    needs:
+      - prepare-workflow
+      - publish-repositories
+    uses: ./.github/workflows/test-package-downloads-action-windows.yml
+    with:
+      distro-slug: windows-2022
+      platform: windows
+      arch: x86
+      pkg-type: NSIS
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      environment: staging
+      skip-code-coverage: true
+    secrets: inherit
+
+  windows-2022-msi-x86-pkg-download-tests:
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    name: Test Windows 2022 x86 MSI Package Downloads
+    needs:
+      - prepare-workflow
+      - publish-repositories
+    uses: ./.github/workflows/test-package-downloads-action-windows.yml
+    with:
+      distro-slug: windows-2022
+      platform: windows
+      arch: x86
+      pkg-type: MSI
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      environment: staging
+      skip-code-coverage: true
+    secrets: inherit
+
   publish-pypi:
     name: Publish to PyPi(test)
     if: ${{ github.event.repository.fork != true }}
@@ -2674,8 +2710,10 @@ jobs:
       - ubuntu-2204-pkg-download-tests
       - ubuntu-2204-arm64-pkg-download-tests
       - macos-12-pkg-download-tests
-      - windows-2022-nsis-pkg-download-tests
-      - windows-2022-msi-pkg-download-tests
+      - windows-2022-nsis-amd64-pkg-download-tests
+      - windows-2022-msi-amd64-pkg-download-tests
+      - windows-2022-nsis-x86-pkg-download-tests
+      - windows-2022-msi-x86-pkg-download-tests
     environment: staging
     runs-on:
       - self-hosted

.github/workflows/templates/test-pkg-repo-downloads.yml.jinja

@@ -61,7 +61,9 @@
   <%- endfor %>
 
 
-  <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %>
+  <%- for slug, display_name, arch in (
+                                        ("macos-12", "macOS 12", "x86_64"),
+                                      ) %>
     <%- set job_name = "{}-pkg-download-tests".format(slug.replace(".", "")) %>
 
   <{ job_name }>:
@@ -93,9 +95,10 @@
 
   <%- for slug, display_name, arch in (
                                         ("windows-2022", "Windows 2022", "amd64"),
+                                        ("windows-2022", "Windows 2022", "x86"),
                                       ) %>
     <%- for pkg_type in ("NSIS", "MSI") %>
-    <%- set job_name = "{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %>
+    <%- set job_name = "{}-{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type.lower(), arch.lower()) %>
 
   <{ job_name }>:
     <%- do test_repo_needs.append(job_name) %>
@@ -104,7 +107,7 @@
     <%- else %>
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     <%- endif %>
-    name: Test <{ display_name }> <{ pkg_type }> Package Downloads
+    name: Test <{ display_name }> <{ arch }> <{ pkg_type }> Package Downloads
     needs:
       - prepare-workflow
       - publish-repositories