Let's use package instead of pkg

.github/workflows/release.yml

@@ -220,8 +220,8 @@ jobs:
         run: |
           tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }}
 
-  almalinux-8-pkg-download-tests-pkg:
-    name: Test Alma Linux 8 Package Downloads
+  almalinux-8-pkg-download-tests-package:
+    name: Test Alma Linux 8 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -237,11 +237,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  almalinux-8-arm64-pkg-download-tests-pkg:
-    name: Test Alma Linux 8 Arm64 Package Downloads
+  almalinux-8-arm64-pkg-download-tests-package:
+    name: Test Alma Linux 8 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -257,11 +257,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  almalinux-9-pkg-download-tests-pkg:
-    name: Test Alma Linux 9 Package Downloads
+  almalinux-9-pkg-download-tests-package:
+    name: Test Alma Linux 9 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -277,11 +277,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  almalinux-9-arm64-pkg-download-tests-pkg:
-    name: Test Alma Linux 9 Arm64 Package Downloads
+  almalinux-9-arm64-pkg-download-tests-package:
+    name: Test Alma Linux 9 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -297,11 +297,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  amazonlinux-2-pkg-download-tests-pkg:
-    name: Test Amazon Linux 2 Package Downloads
+  amazonlinux-2-pkg-download-tests-package:
+    name: Test Amazon Linux 2 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -317,11 +317,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  amazonlinux-2-arm64-pkg-download-tests-pkg:
-    name: Test Amazon Linux 2 Arm64 Package Downloads
+  amazonlinux-2-arm64-pkg-download-tests-package:
+    name: Test Amazon Linux 2 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -337,11 +337,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centos-7-pkg-download-tests-pkg:
-    name: Test CentOS 7 Package Downloads
+  centos-7-pkg-download-tests-package:
+    name: Test CentOS 7 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -357,11 +357,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centos-7-arm64-pkg-download-tests-pkg:
-    name: Test CentOS 7 Arm64 Package Downloads
+  centos-7-arm64-pkg-download-tests-package:
+    name: Test CentOS 7 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -377,11 +377,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-8-pkg-download-tests-pkg:
-    name: Test CentOS Stream 8 Package Downloads
+  centosstream-8-pkg-download-tests-package:
+    name: Test CentOS Stream 8 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -397,11 +397,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-8-arm64-pkg-download-tests-pkg:
-    name: Test CentOS Stream 8 Arm64 Package Downloads
+  centosstream-8-arm64-pkg-download-tests-package:
+    name: Test CentOS Stream 8 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -417,11 +417,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-9-pkg-download-tests-pkg:
-    name: Test CentOS Stream 9 Package Downloads
+  centosstream-9-pkg-download-tests-package:
+    name: Test CentOS Stream 9 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -437,11 +437,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-9-arm64-pkg-download-tests-pkg:
-    name: Test CentOS Stream 9 Arm64 Package Downloads
+  centosstream-9-arm64-pkg-download-tests-package:
+    name: Test CentOS Stream 9 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -457,11 +457,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  debian-10-pkg-download-tests-pkg:
-    name: Test Debian 10 Package Downloads
+  debian-10-pkg-download-tests-package:
+    name: Test Debian 10 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -477,11 +477,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  debian-11-pkg-download-tests-pkg:
-    name: Test Debian 11 Package Downloads
+  debian-11-pkg-download-tests-package:
+    name: Test Debian 11 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -497,11 +497,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  debian-11-arm64-pkg-download-tests-pkg:
-    name: Test Debian 11 Arm64 Package Downloads
+  debian-11-arm64-pkg-download-tests-package:
+    name: Test Debian 11 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -517,11 +517,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-37-pkg-download-tests-pkg:
-    name: Test Fedora 37 Package Downloads
+  fedora-37-pkg-download-tests-package:
+    name: Test Fedora 37 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -537,11 +537,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-37-arm64-pkg-download-tests-pkg:
-    name: Test Fedora 37 Arm64 Package Downloads
+  fedora-37-arm64-pkg-download-tests-package:
+    name: Test Fedora 37 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -557,11 +557,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-38-pkg-download-tests-pkg:
-    name: Test Fedora 38 Package Downloads
+  fedora-38-pkg-download-tests-package:
+    name: Test Fedora 38 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -577,11 +577,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-38-arm64-pkg-download-tests-pkg:
-    name: Test Fedora 38 Arm64 Package Downloads
+  fedora-38-arm64-pkg-download-tests-package:
+    name: Test Fedora 38 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -597,11 +597,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  photonos-3-pkg-download-tests-pkg:
-    name: Test Photon OS 3 Package Downloads
+  photonos-3-pkg-download-tests-package:
+    name: Test Photon OS 3 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -617,11 +617,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  photonos-4-pkg-download-tests-pkg:
-    name: Test Photon OS 4 Package Downloads
+  photonos-4-pkg-download-tests-package:
+    name: Test Photon OS 4 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -637,11 +637,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2004-pkg-download-tests-pkg:
-    name: Test Ubuntu 20.04 Package Downloads
+  ubuntu-2004-pkg-download-tests-package:
+    name: Test Ubuntu 20.04 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -657,11 +657,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2004-arm64-pkg-download-tests-pkg:
-    name: Test Ubuntu 20.04 Arm64 Package Downloads
+  ubuntu-2004-arm64-pkg-download-tests-package:
+    name: Test Ubuntu 20.04 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -677,11 +677,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2204-pkg-download-tests-pkg:
-    name: Test Ubuntu 22.04 Package Downloads
+  ubuntu-2204-pkg-download-tests-package:
+    name: Test Ubuntu 22.04 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -697,11 +697,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2204-arm64-pkg-download-tests-pkg:
-    name: Test Ubuntu 22.04 Arm64 Package Downloads
+  ubuntu-2204-arm64-pkg-download-tests-package:
+    name: Test Ubuntu 22.04 Arm64 Package Downloads (package)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -717,11 +717,11 @@ jobs:
       environment: release
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
   ubuntu-2204-pkg-download-tests-onedir:
-    name: Test Ubuntu 22.04 Package Downloads
+    name: Test Ubuntu 22.04 Package Downloads (onedir)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -741,7 +741,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-arm64-pkg-download-tests-onedir:
-    name: Test Ubuntu 22.04 Arm64 Package Downloads
+    name: Test Ubuntu 22.04 Arm64 Package Downloads (onedir)
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -830,31 +830,31 @@ jobs:
       - prepare-workflow
       - backup
       - publish-repositories
-      - 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
+      - almalinux-8-pkg-download-tests-package
+      - almalinux-8-arm64-pkg-download-tests-package
+      - almalinux-9-pkg-download-tests-package
+      - almalinux-9-arm64-pkg-download-tests-package
+      - amazonlinux-2-pkg-download-tests-package
+      - amazonlinux-2-arm64-pkg-download-tests-package
+      - centos-7-pkg-download-tests-package
+      - centos-7-arm64-pkg-download-tests-package
+      - centosstream-8-pkg-download-tests-package
+      - centosstream-8-arm64-pkg-download-tests-package
+      - centosstream-9-pkg-download-tests-package
+      - centosstream-9-arm64-pkg-download-tests-package
+      - debian-10-pkg-download-tests-package
+      - debian-11-pkg-download-tests-package
+      - debian-11-arm64-pkg-download-tests-package
+      - fedora-37-pkg-download-tests-package
+      - fedora-37-arm64-pkg-download-tests-package
+      - fedora-38-pkg-download-tests-package
+      - fedora-38-arm64-pkg-download-tests-package
+      - photonos-3-pkg-download-tests-package
+      - photonos-4-pkg-download-tests-package
+      - ubuntu-2004-pkg-download-tests-package
+      - ubuntu-2004-arm64-pkg-download-tests-package
+      - ubuntu-2204-pkg-download-tests-package
+      - ubuntu-2204-arm64-pkg-download-tests-package
       - ubuntu-2204-pkg-download-tests-onedir
       - ubuntu-2204-arm64-pkg-download-tests-onedir
       - macos-12-pkg-download-tests

.github/workflows/staging.yml

@@ -2084,8 +2084,8 @@ jobs:
           retention-days: 7
           if-no-files-found: error
 
-  almalinux-8-pkg-download-tests-pkg:
-    name: Test Alma Linux 8 Package Downloads
+  almalinux-8-pkg-download-tests-package:
+    name: Test Alma Linux 8 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2100,11 +2100,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  almalinux-8-arm64-pkg-download-tests-pkg:
-    name: Test Alma Linux 8 Arm64 Package Downloads
+  almalinux-8-arm64-pkg-download-tests-package:
+    name: Test Alma Linux 8 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2119,11 +2119,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  almalinux-9-pkg-download-tests-pkg:
-    name: Test Alma Linux 9 Package Downloads
+  almalinux-9-pkg-download-tests-package:
+    name: Test Alma Linux 9 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2138,11 +2138,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  almalinux-9-arm64-pkg-download-tests-pkg:
-    name: Test Alma Linux 9 Arm64 Package Downloads
+  almalinux-9-arm64-pkg-download-tests-package:
+    name: Test Alma Linux 9 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2157,11 +2157,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  amazonlinux-2-pkg-download-tests-pkg:
-    name: Test Amazon Linux 2 Package Downloads
+  amazonlinux-2-pkg-download-tests-package:
+    name: Test Amazon Linux 2 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2176,11 +2176,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  amazonlinux-2-arm64-pkg-download-tests-pkg:
-    name: Test Amazon Linux 2 Arm64 Package Downloads
+  amazonlinux-2-arm64-pkg-download-tests-package:
+    name: Test Amazon Linux 2 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2195,11 +2195,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centos-7-pkg-download-tests-pkg:
-    name: Test CentOS 7 Package Downloads
+  centos-7-pkg-download-tests-package:
+    name: Test CentOS 7 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2214,11 +2214,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centos-7-arm64-pkg-download-tests-pkg:
-    name: Test CentOS 7 Arm64 Package Downloads
+  centos-7-arm64-pkg-download-tests-package:
+    name: Test CentOS 7 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2233,11 +2233,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-8-pkg-download-tests-pkg:
-    name: Test CentOS Stream 8 Package Downloads
+  centosstream-8-pkg-download-tests-package:
+    name: Test CentOS Stream 8 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2252,11 +2252,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-8-arm64-pkg-download-tests-pkg:
-    name: Test CentOS Stream 8 Arm64 Package Downloads
+  centosstream-8-arm64-pkg-download-tests-package:
+    name: Test CentOS Stream 8 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2271,11 +2271,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-9-pkg-download-tests-pkg:
-    name: Test CentOS Stream 9 Package Downloads
+  centosstream-9-pkg-download-tests-package:
+    name: Test CentOS Stream 9 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2290,11 +2290,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  centosstream-9-arm64-pkg-download-tests-pkg:
-    name: Test CentOS Stream 9 Arm64 Package Downloads
+  centosstream-9-arm64-pkg-download-tests-package:
+    name: Test CentOS Stream 9 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2309,11 +2309,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  debian-10-pkg-download-tests-pkg:
-    name: Test Debian 10 Package Downloads
+  debian-10-pkg-download-tests-package:
+    name: Test Debian 10 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2328,11 +2328,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  debian-11-pkg-download-tests-pkg:
-    name: Test Debian 11 Package Downloads
+  debian-11-pkg-download-tests-package:
+    name: Test Debian 11 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2347,11 +2347,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  debian-11-arm64-pkg-download-tests-pkg:
-    name: Test Debian 11 Arm64 Package Downloads
+  debian-11-arm64-pkg-download-tests-package:
+    name: Test Debian 11 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2366,11 +2366,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-37-pkg-download-tests-pkg:
-    name: Test Fedora 37 Package Downloads
+  fedora-37-pkg-download-tests-package:
+    name: Test Fedora 37 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2385,11 +2385,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-37-arm64-pkg-download-tests-pkg:
-    name: Test Fedora 37 Arm64 Package Downloads
+  fedora-37-arm64-pkg-download-tests-package:
+    name: Test Fedora 37 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2404,11 +2404,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-38-pkg-download-tests-pkg:
-    name: Test Fedora 38 Package Downloads
+  fedora-38-pkg-download-tests-package:
+    name: Test Fedora 38 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2423,11 +2423,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  fedora-38-arm64-pkg-download-tests-pkg:
-    name: Test Fedora 38 Arm64 Package Downloads
+  fedora-38-arm64-pkg-download-tests-package:
+    name: Test Fedora 38 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2442,11 +2442,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  photonos-3-pkg-download-tests-pkg:
-    name: Test Photon OS 3 Package Downloads
+  photonos-3-pkg-download-tests-package:
+    name: Test Photon OS 3 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2461,11 +2461,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  photonos-4-pkg-download-tests-pkg:
-    name: Test Photon OS 4 Package Downloads
+  photonos-4-pkg-download-tests-package:
+    name: Test Photon OS 4 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2480,11 +2480,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2004-pkg-download-tests-pkg:
-    name: Test Ubuntu 20.04 Package Downloads
+  ubuntu-2004-pkg-download-tests-package:
+    name: Test Ubuntu 20.04 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2499,11 +2499,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2004-arm64-pkg-download-tests-pkg:
-    name: Test Ubuntu 20.04 Arm64 Package Downloads
+  ubuntu-2004-arm64-pkg-download-tests-package:
+    name: Test Ubuntu 20.04 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2518,11 +2518,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2204-pkg-download-tests-pkg:
-    name: Test Ubuntu 22.04 Package Downloads
+  ubuntu-2204-pkg-download-tests-package:
+    name: Test Ubuntu 22.04 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2537,11 +2537,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
-  ubuntu-2204-arm64-pkg-download-tests-pkg:
-    name: Test Ubuntu 22.04 Arm64 Package Downloads
+  ubuntu-2204-arm64-pkg-download-tests-package:
+    name: Test Ubuntu 22.04 Arm64 Package Downloads (package)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2556,11 +2556,11 @@ jobs:
       environment: staging
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
-      test-type: pkg
+      test-type: package
     secrets: inherit
 
   ubuntu-2204-pkg-download-tests-onedir:
-    name: Test Ubuntu 22.04 Package Downloads
+    name: Test Ubuntu 22.04 Package Downloads (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2579,7 +2579,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-arm64-pkg-download-tests-onedir:
-    name: Test Ubuntu 22.04 Arm64 Package Downloads
+    name: Test Ubuntu 22.04 Arm64 Package Downloads (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2702,31 +2702,31 @@ jobs:
       - windows-2019-msi-pkg-tests
       - windows-2022-nsis-pkg-tests
       - windows-2022-msi-pkg-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
+      - almalinux-8-pkg-download-tests-package
+      - almalinux-8-arm64-pkg-download-tests-package
+      - almalinux-9-pkg-download-tests-package
+      - almalinux-9-arm64-pkg-download-tests-package
+      - amazonlinux-2-pkg-download-tests-package
+      - amazonlinux-2-arm64-pkg-download-tests-package
+      - centos-7-pkg-download-tests-package
+      - centos-7-arm64-pkg-download-tests-package
+      - centosstream-8-pkg-download-tests-package
+      - centosstream-8-arm64-pkg-download-tests-package
+      - centosstream-9-pkg-download-tests-package
+      - centosstream-9-arm64-pkg-download-tests-package
+      - debian-10-pkg-download-tests-package
+      - debian-11-pkg-download-tests-package
+      - debian-11-arm64-pkg-download-tests-package
+      - fedora-37-pkg-download-tests-package
+      - fedora-37-arm64-pkg-download-tests-package
+      - fedora-38-pkg-download-tests-package
+      - fedora-38-arm64-pkg-download-tests-package
+      - photonos-3-pkg-download-tests-package
+      - photonos-4-pkg-download-tests-package
+      - ubuntu-2004-pkg-download-tests-package
+      - ubuntu-2004-arm64-pkg-download-tests-package
+      - ubuntu-2204-pkg-download-tests-package
+      - ubuntu-2204-arm64-pkg-download-tests-package
       - ubuntu-2204-pkg-download-tests-onedir
       - ubuntu-2204-arm64-pkg-download-tests-onedir
       - macos-12-pkg-download-tests

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

@@ -1,30 +1,30 @@
 
   <%- set linux_pkg_tests = (
-                               ("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"),
+                               ("almalinux-8", "Alma Linux 8", "x86_64", "package"),
+                               ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"),
+                               ("almalinux-9", "Alma Linux 9", "x86_64", "package"),
+                               ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"),
+                               ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"),
+                               ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"),
+                               ("centos-7", "CentOS 7", "x86_64", "package"),
+                               ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"),
+                               ("centosstream-8", "CentOS Stream 8", "x86_64", "package"),
+                               ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"),
+                               ("centosstream-9", "CentOS Stream 9", "x86_64", "package"),
+                               ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"),
+                               ("debian-10", "Debian 10", "x86_64", "package"),
+                               ("debian-11", "Debian 11", "x86_64", "package"),
+                               ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"),
+                               ("fedora-37", "Fedora 37", "x86_64", "package"),
+                               ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"),
+                               ("fedora-38", "Fedora 38", "x86_64", "package"),
+                               ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"),
+                               ("photonos-3", "Photon OS 3", "x86_64", "package"),
+                               ("photonos-4", "Photon OS 4", "x86_64", "package"),
+                               ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"),
+                               ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"),
+                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"),
+                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"),
                                ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"),
                                ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir")
                             ) %>
@@ -35,7 +35,7 @@
 
   <{ job_name }>:
     <%- do test_repo_needs.append(job_name) %>
-    name: Test <{ display_name }> Package Downloads
+    name: Test <{ display_name }> Package Downloads (<{ type }>)
     <%- if gh_environment == "staging" %>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     <%- else %>

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

@@ -50,7 +50,7 @@ on:
         required: false
         type: string
         description: The type of artifact to download
-        default: pkg
+        default: package
 
 
 env: