Add type option for linux package downloads tests and add onedir type steps for linux x86_64 and aarch64

.github/workflows/release.yml

@@ -220,7 +220,7 @@ jobs:
         run: |
           tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }}
 
-  almalinux-8-pkg-download-tests:
+  almalinux-8-pkg-download-tests-pkg:
     name: Test Alma Linux 8 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -237,9 +237,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  almalinux-8-arm64-pkg-download-tests:
+  almalinux-8-arm64-pkg-download-tests-pkg:
     name: Test Alma Linux 8 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -256,9 +257,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  almalinux-9-pkg-download-tests:
+  almalinux-9-pkg-download-tests-pkg:
     name: Test Alma Linux 9 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -275,9 +277,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  almalinux-9-arm64-pkg-download-tests:
+  almalinux-9-arm64-pkg-download-tests-pkg:
     name: Test Alma Linux 9 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -294,9 +297,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  amazonlinux-2-pkg-download-tests:
+  amazonlinux-2-pkg-download-tests-pkg:
     name: Test Amazon Linux 2 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -313,9 +317,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  amazonlinux-2-arm64-pkg-download-tests:
+  amazonlinux-2-arm64-pkg-download-tests-pkg:
     name: Test Amazon Linux 2 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -332,9 +337,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centos-7-pkg-download-tests:
+  centos-7-pkg-download-tests-pkg:
     name: Test CentOS 7 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -351,9 +357,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centos-7-arm64-pkg-download-tests:
+  centos-7-arm64-pkg-download-tests-pkg:
     name: Test CentOS 7 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -370,9 +377,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-8-pkg-download-tests:
+  centosstream-8-pkg-download-tests-pkg:
     name: Test CentOS Stream 8 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -389,9 +397,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-8-arm64-pkg-download-tests:
+  centosstream-8-arm64-pkg-download-tests-pkg:
     name: Test CentOS Stream 8 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -408,9 +417,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-9-pkg-download-tests:
+  centosstream-9-pkg-download-tests-pkg:
     name: Test CentOS Stream 9 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -427,9 +437,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-9-arm64-pkg-download-tests:
+  centosstream-9-arm64-pkg-download-tests-pkg:
     name: Test CentOS Stream 9 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -446,9 +457,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  debian-10-pkg-download-tests:
+  debian-10-pkg-download-tests-pkg:
     name: Test Debian 10 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -465,9 +477,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  debian-11-pkg-download-tests:
+  debian-11-pkg-download-tests-pkg:
     name: Test Debian 11 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -484,9 +497,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  debian-11-arm64-pkg-download-tests:
+  debian-11-arm64-pkg-download-tests-pkg:
     name: Test Debian 11 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -503,9 +517,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-37-pkg-download-tests:
+  fedora-37-pkg-download-tests-pkg:
     name: Test Fedora 37 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -522,9 +537,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-37-arm64-pkg-download-tests:
+  fedora-37-arm64-pkg-download-tests-pkg:
     name: Test Fedora 37 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -541,9 +557,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-38-pkg-download-tests:
+  fedora-38-pkg-download-tests-pkg:
     name: Test Fedora 38 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -560,9 +577,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-38-arm64-pkg-download-tests:
+  fedora-38-arm64-pkg-download-tests-pkg:
     name: Test Fedora 38 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -579,9 +597,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  photonos-3-pkg-download-tests:
+  photonos-3-pkg-download-tests-pkg:
     name: Test Photon OS 3 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -598,9 +617,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  photonos-4-pkg-download-tests:
+  photonos-4-pkg-download-tests-pkg:
     name: Test Photon OS 4 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -617,9 +637,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2004-pkg-download-tests:
+  ubuntu-2004-pkg-download-tests-pkg:
     name: Test Ubuntu 20.04 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -636,9 +657,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2004-arm64-pkg-download-tests:
+  ubuntu-2004-arm64-pkg-download-tests-pkg:
     name: Test Ubuntu 20.04 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -655,9 +677,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2204-pkg-download-tests:
+  ubuntu-2204-pkg-download-tests-pkg:
     name: Test Ubuntu 22.04 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -674,9 +697,10 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2204-arm64-pkg-download-tests:
+  ubuntu-2204-arm64-pkg-download-tests-pkg:
     name: Test Ubuntu 22.04 Arm64 Package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
@@ -693,6 +717,47 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
+    secrets: inherit
+
+  ubuntu-2204-pkg-download-tests-onedir:
+    name: Test Ubuntu 22.04 Package Downloads
+    if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
+    needs:
+      - prepare-workflow
+      - publish-repositories
+      - download-onedir-artifact
+    uses: ./.github/workflows/test-package-downloads-action-linux.yml
+    with:
+      distro-slug: ubuntu-22.04
+      platform: linux
+      arch: x86_64
+      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
+      latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: onedir
+    secrets: inherit
+
+  ubuntu-2204-arm64-pkg-download-tests-onedir:
+    name: Test Ubuntu 22.04 Arm64 Package Downloads
+    if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
+    needs:
+      - prepare-workflow
+      - publish-repositories
+      - download-onedir-artifact
+    uses: ./.github/workflows/test-package-downloads-action-linux.yml
+    with:
+      distro-slug: ubuntu-22.04-arm64
+      platform: linux
+      arch: aarch64
+      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
+      latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: onedir
     secrets: inherit
 
   macos-12-pkg-download-tests:
@@ -765,31 +830,33 @@ jobs:
       - prepare-workflow
       - backup
       - publish-repositories
-      - almalinux-8-pkg-download-tests
-      - almalinux-8-arm64-pkg-download-tests
-      - almalinux-9-pkg-download-tests
-      - almalinux-9-arm64-pkg-download-tests
-      - amazonlinux-2-pkg-download-tests
-      - amazonlinux-2-arm64-pkg-download-tests
-      - centos-7-pkg-download-tests
-      - centos-7-arm64-pkg-download-tests
-      - centosstream-8-pkg-download-tests
-      - centosstream-8-arm64-pkg-download-tests
-      - centosstream-9-pkg-download-tests
-      - centosstream-9-arm64-pkg-download-tests
-      - debian-10-pkg-download-tests
-      - debian-11-pkg-download-tests
-      - debian-11-arm64-pkg-download-tests
-      - fedora-37-pkg-download-tests
-      - fedora-37-arm64-pkg-download-tests
-      - fedora-38-pkg-download-tests
-      - fedora-38-arm64-pkg-download-tests
-      - photonos-3-pkg-download-tests
-      - photonos-4-pkg-download-tests
-      - ubuntu-2004-pkg-download-tests
-      - ubuntu-2004-arm64-pkg-download-tests
-      - ubuntu-2204-pkg-download-tests
-      - ubuntu-2204-arm64-pkg-download-tests
+      - almalinux-8-pkg-download-tests-pkg
+      - almalinux-8-arm64-pkg-download-tests-pkg
+      - almalinux-9-pkg-download-tests-pkg
+      - almalinux-9-arm64-pkg-download-tests-pkg
+      - amazonlinux-2-pkg-download-tests-pkg
+      - amazonlinux-2-arm64-pkg-download-tests-pkg
+      - centos-7-pkg-download-tests-pkg
+      - centos-7-arm64-pkg-download-tests-pkg
+      - centosstream-8-pkg-download-tests-pkg
+      - centosstream-8-arm64-pkg-download-tests-pkg
+      - centosstream-9-pkg-download-tests-pkg
+      - centosstream-9-arm64-pkg-download-tests-pkg
+      - debian-10-pkg-download-tests-pkg
+      - debian-11-pkg-download-tests-pkg
+      - debian-11-arm64-pkg-download-tests-pkg
+      - fedora-37-pkg-download-tests-pkg
+      - fedora-37-arm64-pkg-download-tests-pkg
+      - fedora-38-pkg-download-tests-pkg
+      - fedora-38-arm64-pkg-download-tests-pkg
+      - photonos-3-pkg-download-tests-pkg
+      - photonos-4-pkg-download-tests-pkg
+      - ubuntu-2004-pkg-download-tests-pkg
+      - ubuntu-2004-arm64-pkg-download-tests-pkg
+      - ubuntu-2204-pkg-download-tests-pkg
+      - ubuntu-2204-arm64-pkg-download-tests-pkg
+      - ubuntu-2204-pkg-download-tests-onedir
+      - ubuntu-2204-arm64-pkg-download-tests-onedir
       - macos-12-pkg-download-tests
       - windows-2022-nsis-amd64-pkg-download-tests
       - windows-2022-msi-amd64-pkg-download-tests

.github/workflows/staging.yml

@@ -2084,7 +2084,7 @@ jobs:
           retention-days: 7
           if-no-files-found: error
 
-  almalinux-8-pkg-download-tests:
+  almalinux-8-pkg-download-tests-pkg:
     name: Test Alma Linux 8 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2100,9 +2100,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  almalinux-8-arm64-pkg-download-tests:
+  almalinux-8-arm64-pkg-download-tests-pkg:
     name: Test Alma Linux 8 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2118,9 +2119,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  almalinux-9-pkg-download-tests:
+  almalinux-9-pkg-download-tests-pkg:
     name: Test Alma Linux 9 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2136,9 +2138,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  almalinux-9-arm64-pkg-download-tests:
+  almalinux-9-arm64-pkg-download-tests-pkg:
     name: Test Alma Linux 9 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2154,9 +2157,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  amazonlinux-2-pkg-download-tests:
+  amazonlinux-2-pkg-download-tests-pkg:
     name: Test Amazon Linux 2 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2172,9 +2176,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  amazonlinux-2-arm64-pkg-download-tests:
+  amazonlinux-2-arm64-pkg-download-tests-pkg:
     name: Test Amazon Linux 2 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2190,9 +2195,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centos-7-pkg-download-tests:
+  centos-7-pkg-download-tests-pkg:
     name: Test CentOS 7 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2208,9 +2214,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centos-7-arm64-pkg-download-tests:
+  centos-7-arm64-pkg-download-tests-pkg:
     name: Test CentOS 7 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2226,9 +2233,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-8-pkg-download-tests:
+  centosstream-8-pkg-download-tests-pkg:
     name: Test CentOS Stream 8 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2244,9 +2252,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-8-arm64-pkg-download-tests:
+  centosstream-8-arm64-pkg-download-tests-pkg:
     name: Test CentOS Stream 8 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2262,9 +2271,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-9-pkg-download-tests:
+  centosstream-9-pkg-download-tests-pkg:
     name: Test CentOS Stream 9 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2280,9 +2290,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  centosstream-9-arm64-pkg-download-tests:
+  centosstream-9-arm64-pkg-download-tests-pkg:
     name: Test CentOS Stream 9 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2298,9 +2309,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  debian-10-pkg-download-tests:
+  debian-10-pkg-download-tests-pkg:
     name: Test Debian 10 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2316,9 +2328,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  debian-11-pkg-download-tests:
+  debian-11-pkg-download-tests-pkg:
     name: Test Debian 11 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2334,9 +2347,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  debian-11-arm64-pkg-download-tests:
+  debian-11-arm64-pkg-download-tests-pkg:
     name: Test Debian 11 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2352,9 +2366,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-37-pkg-download-tests:
+  fedora-37-pkg-download-tests-pkg:
     name: Test Fedora 37 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2370,9 +2385,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-37-arm64-pkg-download-tests:
+  fedora-37-arm64-pkg-download-tests-pkg:
     name: Test Fedora 37 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2388,9 +2404,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-38-pkg-download-tests:
+  fedora-38-pkg-download-tests-pkg:
     name: Test Fedora 38 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2406,9 +2423,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  fedora-38-arm64-pkg-download-tests:
+  fedora-38-arm64-pkg-download-tests-pkg:
     name: Test Fedora 38 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2424,9 +2442,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  photonos-3-pkg-download-tests:
+  photonos-3-pkg-download-tests-pkg:
     name: Test Photon OS 3 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2442,9 +2461,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  photonos-4-pkg-download-tests:
+  photonos-4-pkg-download-tests-pkg:
     name: Test Photon OS 4 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2460,9 +2480,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2004-pkg-download-tests:
+  ubuntu-2004-pkg-download-tests-pkg:
     name: Test Ubuntu 20.04 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2478,9 +2499,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2004-arm64-pkg-download-tests:
+  ubuntu-2004-arm64-pkg-download-tests-pkg:
     name: Test Ubuntu 20.04 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2496,9 +2518,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2204-pkg-download-tests:
+  ubuntu-2204-pkg-download-tests-pkg:
     name: Test Ubuntu 22.04 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2514,9 +2537,10 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
     secrets: inherit
 
-  ubuntu-2204-arm64-pkg-download-tests:
+  ubuntu-2204-arm64-pkg-download-tests-pkg:
     name: Test Ubuntu 22.04 Arm64 Package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
@@ -2532,6 +2556,45 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: pkg
+    secrets: inherit
+
+  ubuntu-2204-pkg-download-tests-onedir:
+    name: Test Ubuntu 22.04 Package Downloads
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - publish-repositories
+    uses: ./.github/workflows/test-package-downloads-action-linux.yml
+    with:
+      distro-slug: ubuntu-22.04
+      platform: linux
+      arch: x86_64
+      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
+      latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: onedir
+    secrets: inherit
+
+  ubuntu-2204-arm64-pkg-download-tests-onedir:
+    name: Test Ubuntu 22.04 Arm64 Package Downloads
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - publish-repositories
+    uses: ./.github/workflows/test-package-downloads-action-linux.yml
+    with:
+      distro-slug: ubuntu-22.04-arm64
+      platform: linux
+      arch: aarch64
+      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
+      latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: onedir
     secrets: inherit
 
   macos-12-pkg-download-tests:
@@ -2639,31 +2702,33 @@ jobs:
       - windows-2019-msi-pkg-tests
       - windows-2022-nsis-pkg-tests
       - windows-2022-msi-pkg-tests
-      - almalinux-8-pkg-download-tests
-      - almalinux-8-arm64-pkg-download-tests
-      - almalinux-9-pkg-download-tests
-      - almalinux-9-arm64-pkg-download-tests
-      - amazonlinux-2-pkg-download-tests
-      - amazonlinux-2-arm64-pkg-download-tests
-      - centos-7-pkg-download-tests
-      - centos-7-arm64-pkg-download-tests
-      - centosstream-8-pkg-download-tests
-      - centosstream-8-arm64-pkg-download-tests
-      - centosstream-9-pkg-download-tests
-      - centosstream-9-arm64-pkg-download-tests
-      - debian-10-pkg-download-tests
-      - debian-11-pkg-download-tests
-      - debian-11-arm64-pkg-download-tests
-      - fedora-37-pkg-download-tests
-      - fedora-37-arm64-pkg-download-tests
-      - fedora-38-pkg-download-tests
-      - fedora-38-arm64-pkg-download-tests
-      - photonos-3-pkg-download-tests
-      - photonos-4-pkg-download-tests
-      - ubuntu-2004-pkg-download-tests
-      - ubuntu-2004-arm64-pkg-download-tests
-      - ubuntu-2204-pkg-download-tests
-      - ubuntu-2204-arm64-pkg-download-tests
+      - almalinux-8-pkg-download-tests-pkg
+      - almalinux-8-arm64-pkg-download-tests-pkg
+      - almalinux-9-pkg-download-tests-pkg
+      - almalinux-9-arm64-pkg-download-tests-pkg
+      - amazonlinux-2-pkg-download-tests-pkg
+      - amazonlinux-2-arm64-pkg-download-tests-pkg
+      - centos-7-pkg-download-tests-pkg
+      - centos-7-arm64-pkg-download-tests-pkg
+      - centosstream-8-pkg-download-tests-pkg
+      - centosstream-8-arm64-pkg-download-tests-pkg
+      - centosstream-9-pkg-download-tests-pkg
+      - centosstream-9-arm64-pkg-download-tests-pkg
+      - debian-10-pkg-download-tests-pkg
+      - debian-11-pkg-download-tests-pkg
+      - debian-11-arm64-pkg-download-tests-pkg
+      - fedora-37-pkg-download-tests-pkg
+      - fedora-37-arm64-pkg-download-tests-pkg
+      - fedora-38-pkg-download-tests-pkg
+      - fedora-38-arm64-pkg-download-tests-pkg
+      - photonos-3-pkg-download-tests-pkg
+      - photonos-4-pkg-download-tests-pkg
+      - ubuntu-2004-pkg-download-tests-pkg
+      - ubuntu-2004-arm64-pkg-download-tests-pkg
+      - ubuntu-2204-pkg-download-tests-pkg
+      - ubuntu-2204-arm64-pkg-download-tests-pkg
+      - ubuntu-2204-pkg-download-tests-onedir
+      - ubuntu-2204-arm64-pkg-download-tests-onedir
       - macos-12-pkg-download-tests
       - windows-2022-nsis-amd64-pkg-download-tests
       - windows-2022-msi-amd64-pkg-download-tests

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

@@ -1,35 +1,37 @@
 
   <%- set linux_pkg_tests = (
-                               ("almalinux-8", "Alma Linux 8", "x86_64"),
-                               ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"),
-                               ("almalinux-9", "Alma Linux 9", "x86_64"),
-                               ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"),
-                               ("amazonlinux-2", "Amazon Linux 2", "x86_64"),
-                               ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"),
-                               ("centos-7", "CentOS 7", "x86_64"),
-                               ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"),
-                               ("centosstream-8", "CentOS Stream 8", "x86_64"),
-                               ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"),
-                               ("centosstream-9", "CentOS Stream 9", "x86_64"),
-                               ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"),
-                               ("debian-10", "Debian 10", "x86_64"),
-                               ("debian-11", "Debian 11", "x86_64"),
-                               ("debian-11-arm64", "Debian 11 Arm64", "aarch64"),
-                               ("fedora-37", "Fedora 37", "x86_64"),
-                               ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"),
-                               ("fedora-38", "Fedora 38", "x86_64"),
-                               ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"),
-                               ("photonos-3", "Photon OS 3", "x86_64"),
-                               ("photonos-4", "Photon OS 4", "x86_64"),
-                               ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"),
-                               ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"),
-                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"),
-                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")
+                               ("almalinux-8", "Alma Linux 8", "x86_64", "pkg"),
+                               ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "pkg"),
+                               ("almalinux-9", "Alma Linux 9", "x86_64", "pkg"),
+                               ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "pkg"),
+                               ("amazonlinux-2", "Amazon Linux 2", "x86_64", "pkg"),
+                               ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "pkg"),
+                               ("centos-7", "CentOS 7", "x86_64", "pkg"),
+                               ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "pkg"),
+                               ("centosstream-8", "CentOS Stream 8", "x86_64", "pkg"),
+                               ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "pkg"),
+                               ("centosstream-9", "CentOS Stream 9", "x86_64", "pkg"),
+                               ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "pkg"),
+                               ("debian-10", "Debian 10", "x86_64", "pkg"),
+                               ("debian-11", "Debian 11", "x86_64", "pkg"),
+                               ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "pkg"),
+                               ("fedora-37", "Fedora 37", "x86_64", "pkg"),
+                               ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "pkg"),
+                               ("fedora-38", "Fedora 38", "x86_64", "pkg"),
+                               ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "pkg"),
+                               ("photonos-3", "Photon OS 3", "x86_64", "pkg"),
+                               ("photonos-4", "Photon OS 4", "x86_64", "pkg"),
+                               ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "pkg"),
+                               ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "pkg"),
+                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "pkg"),
+                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "pkg"),
+                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"),
+                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir")
                             ) %>
 
 
-  <%- for slug, display_name, arch in linux_pkg_tests %>
-    <%- set job_name = "{}-pkg-download-tests".format(slug.replace(".", "")) %>
+  <%- for slug, display_name, arch, type in linux_pkg_tests %>
+    <%- set job_name = "{}-pkg-download-tests-{}".format(slug.replace(".", ""), type) %>
 
   <{ job_name }>:
     <%- do test_repo_needs.append(job_name) %>
@@ -55,6 +57,7 @@
       environment: <{ gh_environment }>
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      test-type: <{ type }>
     secrets: inherit
 
   <%- endfor %>

.github/workflows/test-package-downloads-action-linux.yml

@@ -46,6 +46,11 @@ on:
         type: string
         description: The nox session to run
         default: test-pkgs-onedir
+      test-type:
+        required: false
+        type: string
+        description: The type of artifact to download
+        default: pkg
 
 
 env: