From 2b5b7b08c7ea42658bc0c48a16bf863312a2338e Mon Sep 17 00:00:00 2001 From: twangboy Date: Thu, 8 Jun 2023 15:03:16 -0600 Subject: [PATCH 01/14] Update `salt-rewrite` to `2.4.4` --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f5059865a7..90dadf55aef 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1046,7 +1046,7 @@ repos: - repo: https://github.com/s0undt3ch/salt-rewrite # Automatically rewrite code with known rules - rev: 2.4.3 + rev: 2.4.4 hooks: - id: salt-rewrite alias: rewrite-docstrings From 8de7aab58c3e075747c107a8886440955918d5c5 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Thu, 1 Jun 2023 13:22:43 -0400 Subject: [PATCH 02/14] Add type option for linux package downloads tests and add onedir type steps for linux x86_64 and aarch64 --- .github/workflows/release.yml | 167 ++++++++++++------ .github/workflows/staging.yml | 165 +++++++++++------ .../test-pkg-repo-downloads.yml.jinja | 57 +++--- .../test-package-downloads-action-linux.yml | 5 + 4 files changed, 267 insertions(+), 127 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f121d380e0a..d0d4e347651 100644 --- a/.github/workflows/release.yml +++ b/.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 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 450f0f5b64b..66fe7aa2a3f 100644 --- a/.github/workflows/staging.yml +++ b/.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 diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja index 8ea9bfed3b7..7dee7f676c1 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.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 %> diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 7df9ec1c8f3..5bc008fc05d 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.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: From 10762899cbcc491d398f2a7625204fcde961a970 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Thu, 1 Jun 2023 13:33:25 -0400 Subject: [PATCH 03/14] Let's use `package` instead of `pkg` --- .github/workflows/release.yml | 204 +++++++++--------- .github/workflows/staging.yml | 204 +++++++++--------- .../test-pkg-repo-downloads.yml.jinja | 52 ++--- .../test-package-downloads-action-linux.yml | 2 +- 4 files changed, 231 insertions(+), 231 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0d4e347651..f3ca57f8a72 100644 --- a/.github/workflows/release.yml +++ b/.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 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 66fe7aa2a3f..96d95d792a8 100644 --- a/.github/workflows/staging.yml +++ b/.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 diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja index 7dee7f676c1..922ed46bc82 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.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 %> diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 5bc008fc05d..95ad023179c 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.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: From 3b631b20ea9a8aed23a09743e3ee11d0f4c26c82 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Thu, 1 Jun 2023 13:45:51 -0400 Subject: [PATCH 04/14] Propogate the artifact type through to the package download tests --- .github/workflows/test-package-downloads-action-linux.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 95ad023179c..a5067de8b50 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -226,10 +226,11 @@ jobs: SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_ARTIFACT_TYPE: ${{ inputs.test-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_ARTIFACT_TYPE \ --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs - name: Run Package Download Tests @@ -243,10 +244,11 @@ jobs: SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_ARTIFACT_TYPE: ${{ inputs.test-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_ARTIFACT_TYPE \ --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - name: Combine Coverage Reports From d99b7684eb2fa88eece052439b0a971d247eb0bb Mon Sep 17 00:00:00 2001 From: MKLeb Date: Thu, 1 Jun 2023 15:03:22 -0400 Subject: [PATCH 05/14] Add initial onedir download test for linux (using Ubuntu x86 and arm) --- pkg/tests/download/test_pkg_download.py | 152 +++++++++++++++--------- 1 file changed, 96 insertions(+), 56 deletions(-) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index 5bb0e3a96a4..56d1366e814 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -81,6 +81,11 @@ def root_url(salt_release): return _root_url +@pytest.fixture(scope="module") +def artifact_type(): + return os.environ.get("DOWNLOAD_TEST_ARTIFACT_TYPE") + + def get_salt_release(): salt_release = os.environ.get("SALT_RELEASE") pkg_test_type = os.environ.get("PKG_TEST_TYPE", "install") @@ -130,11 +135,22 @@ def salt_release(): yield get_salt_release() +@pytest.fixture(scope="module") +def downloads_path(tmp_path_factory): + return tmp_path_factory.mktemp("downloads") + + @pytest.fixture(scope="module") def _setup_system( - tmp_path_factory, grains, shell, root_url, salt_release, gpg_key_name, repo_subpath + grains, + shell, + root_url, + salt_release, + gpg_key_name, + repo_subpath, + artifact_type, + downloads_path, ): - downloads_path = tmp_path_factory.mktemp("downloads") try: # Windows is a special case, because sometimes we need to uninstall the packages if grains["os_family"] == "Windows": @@ -210,6 +226,7 @@ def _setup_system( downloads_path=downloads_path, gpg_key_name=gpg_key_name, repo_subpath=repo_subpath, + artifact_type=artifact_type, ) else: pytest.fail("Don't know how to handle %s", grains["osfinger"]) @@ -286,64 +303,81 @@ def setup_debian_family( downloads_path, gpg_key_name, repo_subpath, + artifact_type, ): arch = os.environ.get("SALT_REPO_ARCH") or "amd64" - if arch == "aarch64": - arch = "arm64" - elif arch == "x86_64": - arch = "amd64" - ret = shell.run("apt-get", "update", "-y", check=False) if ret.returncode != 0: pytest.fail(str(ret)) - if repo_subpath == "minor": - repo_url_base = ( - f"{root_url}/{os_name}/{os_version}/{arch}/{repo_subpath}/{salt_release}" + if artifact_type == "package": + if arch == "aarch64": + arch = "arm64" + elif arch == "x86_64": + arch = "amd64" + + if repo_subpath == "minor": + repo_url_base = f"{root_url}/{os_name}/{os_version}/{arch}/{repo_subpath}/{salt_release}" + else: + repo_url_base = f"{root_url}/{os_name}/{os_version}/{arch}/{repo_subpath}" + gpg_file_url = f"{root_url}/{os_name}/{os_version}/{arch}/{gpg_key_name}" + + try: + pytest.helpers.download_file(gpg_file_url, downloads_path / gpg_key_name) + except Exception as exc: + pytest.fail(f"Failed to download {gpg_file_url}: {exc}") + + salt_sources_path = downloads_path / "salt.list" + salt_sources_path.write_text( + f"deb [signed-by=/usr/share/keyrings/{gpg_key_name} arch={arch}] {repo_url_base} {os_codename} main\n" ) + commands = [ + ( + "mv", + str(downloads_path / gpg_key_name), + f"/usr/share/keyrings/{gpg_key_name}", + ), + ( + "mv", + str(salt_sources_path), + "/etc/apt/sources.list.d/salt.list", + ), + ("apt-get", "install", "-y", "ca-certificates"), + ("update-ca-certificates",), + ("apt-get", "update"), + ( + "apt-get", + "install", + "-y", + "salt-master", + "salt-minion", + "salt-ssh", + "salt-syndic", + "salt-cloud", + "salt-api", + ), + ] + for cmd in commands: + ret = shell.run(*cmd) + if ret.returncode != 0: + pytest.fail(str(ret)) else: - repo_url_base = f"{root_url}/{os_name}/{os_version}/{arch}/{repo_subpath}" - gpg_file_url = f"{root_url}/{os_name}/{os_version}/{arch}/{gpg_key_name}" + # We are testing the onedir download + onedir_name = f"salt-{salt_release}-onedir-linux-{arch}.tar.xz" + if repo_subpath == "minor": + repo_url_base = f"{root_url}/onedir/{repo_subpath}/{salt_release}" + else: + repo_url_base = f"{root_url}/onedir/{repo_subpath}" + onedir_url = f"{repo_url_base}/{onedir_name}" + onedir_location = downloads_path / onedir_name + onedir_extracted = downloads_path / "onedir_extracted" - try: - pytest.helpers.download_file(gpg_file_url, downloads_path / gpg_key_name) - except Exception as exc: - pytest.fail(f"Failed to download {gpg_file_url}: {exc}") + try: + pytest.helpers.download_file(onedir_url, onedir_location) + except Exception as exc: + pytest.fail(f"Failed to download {onedir_url}: {exc}") - salt_sources_path = downloads_path / "salt.list" - salt_sources_path.write_text( - f"deb [signed-by=/usr/share/keyrings/{gpg_key_name} arch={arch}] {repo_url_base} {os_codename} main\n" - ) - commands = [ - ( - "mv", - str(downloads_path / gpg_key_name), - f"/usr/share/keyrings/{gpg_key_name}", - ), - ( - "mv", - str(salt_sources_path), - "/etc/apt/sources.list.d/salt.list", - ), - ("apt-get", "install", "-y", "ca-certificates"), - ("update-ca-certificates",), - ("apt-get", "update"), - ( - "apt-get", - "install", - "-y", - "salt-master", - "salt-minion", - "salt-ssh", - "salt-syndic", - "salt-cloud", - "salt-api", - ), - ] - for cmd in commands: - ret = shell.run(*cmd) - if ret.returncode != 0: - pytest.fail(str(ret)) + shell.run("tar", "xvf", str(onedir_location), "-C", str(onedir_extracted)) def setup_macos(shell, root_url, salt_release, downloads_path, repo_subpath): @@ -426,12 +460,18 @@ def setup_windows(shell, root_url, salt_release, downloads_path, repo_subpath): @pytest.fixture(scope="module") -def install_dir(_setup_system): - if platform.is_windows(): - return pathlib.Path(os.getenv("ProgramFiles"), "Salt Project", "Salt").resolve() - if platform.is_darwin(): - return pathlib.Path("/opt", "salt") - return pathlib.Path("/opt", "saltstack", "salt") +def install_dir(_setup_system, artifact_type, downloads_path): + if artifact_type == "package": + if platform.is_windows(): + return pathlib.Path( + os.getenv("ProgramFiles"), "Salt Project", "Salt" + ).resolve() + if platform.is_darwin(): + return pathlib.Path("/opt", "salt") + return pathlib.Path("/opt", "saltstack", "salt") + else: + # We are testing the onedir + return downloads_path / "onedir_extracted" / "salt" @pytest.fixture(scope="module") From 9ea7a0177b176fa0f236fb2df793b60fe14638d8 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Fri, 2 Jun 2023 14:01:08 -0400 Subject: [PATCH 06/14] Give a separate path to extract the onedir to --- pkg/tests/download/test_pkg_download.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index 56d1366e814..ae12e8d001d 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -136,8 +136,10 @@ def salt_release(): @pytest.fixture(scope="module") -def downloads_path(tmp_path_factory): - return tmp_path_factory.mktemp("downloads") +def onedir_install_path(tmp_path_factory): + install_path = tmp_path_factory.mktemp("onedir_install") + yield install_path + shutil.rmtree(install_path, ignore_errors=True) @pytest.fixture(scope="module") @@ -149,8 +151,10 @@ def _setup_system( gpg_key_name, repo_subpath, artifact_type, - downloads_path, + tmp_path_factory, + onedir_install_path, ): + downloads_path = tmp_path_factory.mktemp("downloads") try: # Windows is a special case, because sometimes we need to uninstall the packages if grains["os_family"] == "Windows": @@ -227,6 +231,7 @@ def _setup_system( gpg_key_name=gpg_key_name, repo_subpath=repo_subpath, artifact_type=artifact_type, + onedir_install_path=onedir_install_path, ) else: pytest.fail("Don't know how to handle %s", grains["osfinger"]) @@ -304,6 +309,7 @@ def setup_debian_family( gpg_key_name, repo_subpath, artifact_type, + onedir_install_path, ): arch = os.environ.get("SALT_REPO_ARCH") or "amd64" ret = shell.run("apt-get", "update", "-y", check=False) @@ -370,7 +376,7 @@ def setup_debian_family( repo_url_base = f"{root_url}/onedir/{repo_subpath}" onedir_url = f"{repo_url_base}/{onedir_name}" onedir_location = downloads_path / onedir_name - onedir_extracted = downloads_path / "onedir_extracted" + onedir_extracted = onedir_install_path try: pytest.helpers.download_file(onedir_url, onedir_location) @@ -460,7 +466,7 @@ def setup_windows(shell, root_url, salt_release, downloads_path, repo_subpath): @pytest.fixture(scope="module") -def install_dir(_setup_system, artifact_type, downloads_path): +def install_dir(_setup_system, artifact_type, onedir_install_path): if artifact_type == "package": if platform.is_windows(): return pathlib.Path( @@ -471,7 +477,7 @@ def install_dir(_setup_system, artifact_type, downloads_path): return pathlib.Path("/opt", "saltstack", "salt") else: # We are testing the onedir - return downloads_path / "onedir_extracted" / "salt" + return onedir_install_path / "salt" @pytest.fixture(scope="module") From ba4f80b0eeca0f40bfa1579cc471b135d0a1cfa6 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Mon, 5 Jun 2023 15:10:33 -0400 Subject: [PATCH 07/14] Add onedir download tests for windows and mac as well --- .github/workflows/release.yml | 275 ++++++++++-------- .github/workflows/staging.yml | 273 +++++++++-------- .../test-pkg-repo-downloads.yml.jinja | 26 +- .../test-package-downloads-action-linux.yml | 17 +- .../test-package-downloads-action-macos.yml | 6 + .../test-package-downloads-action-windows.yml | 8 +- pkg/tests/download/test_pkg_download.py | 191 +++++++----- 7 files changed, 474 insertions(+), 322 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3ca57f8a72..1a32fd6731a 100644 --- a/.github/workflows/release.yml +++ b/.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-package: - name: Test Alma Linux 8 Package Downloads (package) + almalinux-8-package-pkg-download-tests: + name: Test Alma Linux 8 package Downloads 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: package + pkg-type: package secrets: inherit - almalinux-8-arm64-pkg-download-tests-package: - name: Test Alma Linux 8 Arm64 Package Downloads (package) + almalinux-8-arm64-package-pkg-download-tests: + name: Test Alma Linux 8 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - almalinux-9-pkg-download-tests-package: - name: Test Alma Linux 9 Package Downloads (package) + almalinux-9-package-pkg-download-tests: + name: Test Alma Linux 9 package Downloads 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: package + pkg-type: package secrets: inherit - almalinux-9-arm64-pkg-download-tests-package: - name: Test Alma Linux 9 Arm64 Package Downloads (package) + almalinux-9-arm64-package-pkg-download-tests: + name: Test Alma Linux 9 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - amazonlinux-2-pkg-download-tests-package: - name: Test Amazon Linux 2 Package Downloads (package) + amazonlinux-2-package-pkg-download-tests: + name: Test Amazon Linux 2 package Downloads 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: package + pkg-type: package secrets: inherit - amazonlinux-2-arm64-pkg-download-tests-package: - name: Test Amazon Linux 2 Arm64 Package Downloads (package) + amazonlinux-2-arm64-package-pkg-download-tests: + name: Test Amazon Linux 2 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - centos-7-pkg-download-tests-package: - name: Test CentOS 7 Package Downloads (package) + centos-7-package-pkg-download-tests: + name: Test CentOS 7 package Downloads 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: package + pkg-type: package secrets: inherit - centos-7-arm64-pkg-download-tests-package: - name: Test CentOS 7 Arm64 Package Downloads (package) + centos-7-arm64-package-pkg-download-tests: + name: Test CentOS 7 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - centosstream-8-pkg-download-tests-package: - name: Test CentOS Stream 8 Package Downloads (package) + centosstream-8-package-pkg-download-tests: + name: Test CentOS Stream 8 package Downloads 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: package + pkg-type: package secrets: inherit - centosstream-8-arm64-pkg-download-tests-package: - name: Test CentOS Stream 8 Arm64 Package Downloads (package) + centosstream-8-arm64-package-pkg-download-tests: + name: Test CentOS Stream 8 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - centosstream-9-pkg-download-tests-package: - name: Test CentOS Stream 9 Package Downloads (package) + centosstream-9-package-pkg-download-tests: + name: Test CentOS Stream 9 package Downloads 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: package + pkg-type: package secrets: inherit - centosstream-9-arm64-pkg-download-tests-package: - name: Test CentOS Stream 9 Arm64 Package Downloads (package) + centosstream-9-arm64-package-pkg-download-tests: + name: Test CentOS Stream 9 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - debian-10-pkg-download-tests-package: - name: Test Debian 10 Package Downloads (package) + debian-10-package-pkg-download-tests: + name: Test Debian 10 package Downloads 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: package + pkg-type: package secrets: inherit - debian-11-pkg-download-tests-package: - name: Test Debian 11 Package Downloads (package) + debian-11-package-pkg-download-tests: + name: Test Debian 11 package Downloads 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: package + pkg-type: package secrets: inherit - debian-11-arm64-pkg-download-tests-package: - name: Test Debian 11 Arm64 Package Downloads (package) + debian-11-arm64-package-pkg-download-tests: + name: Test Debian 11 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - fedora-37-pkg-download-tests-package: - name: Test Fedora 37 Package Downloads (package) + fedora-37-package-pkg-download-tests: + name: Test Fedora 37 package Downloads 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: package + pkg-type: package secrets: inherit - fedora-37-arm64-pkg-download-tests-package: - name: Test Fedora 37 Arm64 Package Downloads (package) + fedora-37-arm64-package-pkg-download-tests: + name: Test Fedora 37 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - fedora-38-pkg-download-tests-package: - name: Test Fedora 38 Package Downloads (package) + fedora-38-package-pkg-download-tests: + name: Test Fedora 38 package Downloads 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: package + pkg-type: package secrets: inherit - fedora-38-arm64-pkg-download-tests-package: - name: Test Fedora 38 Arm64 Package Downloads (package) + fedora-38-arm64-package-pkg-download-tests: + name: Test Fedora 38 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - photonos-3-pkg-download-tests-package: - name: Test Photon OS 3 Package Downloads (package) + photonos-3-package-pkg-download-tests: + name: Test Photon OS 3 package Downloads 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: package + pkg-type: package secrets: inherit - photonos-4-pkg-download-tests-package: - name: Test Photon OS 4 Package Downloads (package) + photonos-4-package-pkg-download-tests: + name: Test Photon OS 4 package Downloads 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: package + pkg-type: package secrets: inherit - ubuntu-2004-pkg-download-tests-package: - name: Test Ubuntu 20.04 Package Downloads (package) + ubuntu-2004-package-pkg-download-tests: + name: Test Ubuntu 20.04 package Downloads 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: package + pkg-type: package secrets: inherit - ubuntu-2004-arm64-pkg-download-tests-package: - name: Test Ubuntu 20.04 Arm64 Package Downloads (package) + ubuntu-2004-arm64-package-pkg-download-tests: + name: Test Ubuntu 20.04 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - ubuntu-2204-pkg-download-tests-package: - name: Test Ubuntu 22.04 Package Downloads (package) + ubuntu-2204-package-pkg-download-tests: + name: Test Ubuntu 22.04 package Downloads 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: package + pkg-type: package secrets: inherit - ubuntu-2204-arm64-pkg-download-tests-package: - name: Test Ubuntu 22.04 Arm64 Package Downloads (package) + ubuntu-2204-arm64-package-pkg-download-tests: + name: Test Ubuntu 22.04 Arm64 package Downloads 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: package + pkg-type: package secrets: inherit - ubuntu-2204-pkg-download-tests-onedir: - name: Test Ubuntu 22.04 Package Downloads (onedir) + ubuntu-2204-onedir-pkg-download-tests: + name: Test Ubuntu 22.04 onedir Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -737,11 +737,11 @@ jobs: environment: release skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: onedir + pkg-type: onedir secrets: inherit - ubuntu-2204-arm64-pkg-download-tests-onedir: - name: Test Ubuntu 22.04 Arm64 Package Downloads (onedir) + ubuntu-2204-arm64-onedir-pkg-download-tests: + name: Test Ubuntu 22.04 Arm64 onedir Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -757,10 +757,10 @@ jobs: environment: release skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: onedir + pkg-type: onedir secrets: inherit - macos-12-pkg-download-tests: + macos-12-Package-pkg-download-tests: name: Test macOS 12 Package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -777,9 +777,30 @@ jobs: environment: release skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package secrets: inherit - windows-2022-nsis-amd64-pkg-download-tests: + macos-12-Onedir-pkg-download-tests: + name: Test macOS 12 Onedir 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-macos.yml + with: + distro-slug: macos-12 + platform: darwin + 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 }}" + pkg-type: onedir + secrets: inherit + + windows-2022-NSIS-amd64-pkg-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} name: Test Windows 2022 amd64 NSIS Package Downloads needs: @@ -791,7 +812,7 @@ jobs: distro-slug: windows-2022 platform: windows arch: amd64 - pkg-type: NSIS + pkg-type: nsis cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release @@ -799,7 +820,7 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-msi-amd64-pkg-download-tests: + windows-2022-MSI-amd64-pkg-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} name: Test Windows 2022 amd64 MSI Package Downloads needs: @@ -811,7 +832,27 @@ jobs: distro-slug: windows-2022 platform: windows arch: amd64 - pkg-type: MSI + 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 + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + secrets: inherit + + windows-2022-Onedir-amd64-pkg-download-tests: + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + name: Test Windows 2022 amd64 Onedir 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: amd64 + pkg-type: onedir cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release @@ -830,36 +871,38 @@ jobs: - prepare-workflow - backup - publish-repositories - - 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 - - windows-2022-nsis-amd64-pkg-download-tests - - windows-2022-msi-amd64-pkg-download-tests + - almalinux-8-package-pkg-download-tests + - almalinux-8-arm64-package-pkg-download-tests + - almalinux-9-package-pkg-download-tests + - almalinux-9-arm64-package-pkg-download-tests + - amazonlinux-2-package-pkg-download-tests + - amazonlinux-2-arm64-package-pkg-download-tests + - centos-7-package-pkg-download-tests + - centos-7-arm64-package-pkg-download-tests + - centosstream-8-package-pkg-download-tests + - centosstream-8-arm64-package-pkg-download-tests + - centosstream-9-package-pkg-download-tests + - centosstream-9-arm64-package-pkg-download-tests + - debian-10-package-pkg-download-tests + - debian-11-package-pkg-download-tests + - debian-11-arm64-package-pkg-download-tests + - fedora-37-package-pkg-download-tests + - fedora-37-arm64-package-pkg-download-tests + - fedora-38-package-pkg-download-tests + - fedora-38-arm64-package-pkg-download-tests + - photonos-3-package-pkg-download-tests + - photonos-4-package-pkg-download-tests + - ubuntu-2004-package-pkg-download-tests + - ubuntu-2004-arm64-package-pkg-download-tests + - ubuntu-2204-package-pkg-download-tests + - ubuntu-2204-arm64-package-pkg-download-tests + - ubuntu-2204-onedir-pkg-download-tests + - ubuntu-2204-arm64-onedir-pkg-download-tests + - macos-12-Package-pkg-download-tests + - macos-12-Onedir-pkg-download-tests + - windows-2022-NSIS-amd64-pkg-download-tests + - windows-2022-MSI-amd64-pkg-download-tests + - windows-2022-Onedir-amd64-pkg-download-tests environment: release steps: - name: Clone The Salt Repository diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 96d95d792a8..35abe7d8272 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2084,8 +2084,8 @@ jobs: retention-days: 7 if-no-files-found: error - almalinux-8-pkg-download-tests-package: - name: Test Alma Linux 8 Package Downloads (package) + almalinux-8-package-pkg-download-tests: + 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: - prepare-workflow @@ -2100,11 +2100,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - almalinux-8-arm64-pkg-download-tests-package: - name: Test Alma Linux 8 Arm64 Package Downloads (package) + almalinux-8-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2119,11 +2119,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - almalinux-9-pkg-download-tests-package: - name: Test Alma Linux 9 Package Downloads (package) + almalinux-9-package-pkg-download-tests: + 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: - prepare-workflow @@ -2138,11 +2138,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - almalinux-9-arm64-pkg-download-tests-package: - name: Test Alma Linux 9 Arm64 Package Downloads (package) + almalinux-9-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2157,11 +2157,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - amazonlinux-2-pkg-download-tests-package: - name: Test Amazon Linux 2 Package Downloads (package) + amazonlinux-2-package-pkg-download-tests: + 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: - prepare-workflow @@ -2176,11 +2176,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - amazonlinux-2-arm64-pkg-download-tests-package: - name: Test Amazon Linux 2 Arm64 Package Downloads (package) + amazonlinux-2-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2195,11 +2195,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - centos-7-pkg-download-tests-package: - name: Test CentOS 7 Package Downloads (package) + centos-7-package-pkg-download-tests: + 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: - prepare-workflow @@ -2214,11 +2214,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - centos-7-arm64-pkg-download-tests-package: - name: Test CentOS 7 Arm64 Package Downloads (package) + centos-7-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2233,11 +2233,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - centosstream-8-pkg-download-tests-package: - name: Test CentOS Stream 8 Package Downloads (package) + centosstream-8-package-pkg-download-tests: + 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: - prepare-workflow @@ -2252,11 +2252,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - centosstream-8-arm64-pkg-download-tests-package: - name: Test CentOS Stream 8 Arm64 Package Downloads (package) + centosstream-8-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2271,11 +2271,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - centosstream-9-pkg-download-tests-package: - name: Test CentOS Stream 9 Package Downloads (package) + centosstream-9-package-pkg-download-tests: + 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: - prepare-workflow @@ -2290,11 +2290,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - centosstream-9-arm64-pkg-download-tests-package: - name: Test CentOS Stream 9 Arm64 Package Downloads (package) + centosstream-9-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2309,11 +2309,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - debian-10-pkg-download-tests-package: - name: Test Debian 10 Package Downloads (package) + debian-10-package-pkg-download-tests: + 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: - prepare-workflow @@ -2328,11 +2328,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - debian-11-pkg-download-tests-package: - name: Test Debian 11 Package Downloads (package) + debian-11-package-pkg-download-tests: + 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: - prepare-workflow @@ -2347,11 +2347,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - debian-11-arm64-pkg-download-tests-package: - name: Test Debian 11 Arm64 Package Downloads (package) + debian-11-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2366,11 +2366,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - fedora-37-pkg-download-tests-package: - name: Test Fedora 37 Package Downloads (package) + fedora-37-package-pkg-download-tests: + 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: - prepare-workflow @@ -2385,11 +2385,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - fedora-37-arm64-pkg-download-tests-package: - name: Test Fedora 37 Arm64 Package Downloads (package) + fedora-37-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2404,11 +2404,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - fedora-38-pkg-download-tests-package: - name: Test Fedora 38 Package Downloads (package) + fedora-38-package-pkg-download-tests: + 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: - prepare-workflow @@ -2423,11 +2423,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - fedora-38-arm64-pkg-download-tests-package: - name: Test Fedora 38 Arm64 Package Downloads (package) + fedora-38-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2442,11 +2442,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - photonos-3-pkg-download-tests-package: - name: Test Photon OS 3 Package Downloads (package) + photonos-3-package-pkg-download-tests: + 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: - prepare-workflow @@ -2461,11 +2461,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - photonos-4-pkg-download-tests-package: - name: Test Photon OS 4 Package Downloads (package) + photonos-4-package-pkg-download-tests: + 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: - prepare-workflow @@ -2480,11 +2480,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - ubuntu-2004-pkg-download-tests-package: - name: Test Ubuntu 20.04 Package Downloads (package) + ubuntu-2004-package-pkg-download-tests: + 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: - prepare-workflow @@ -2499,11 +2499,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - ubuntu-2004-arm64-pkg-download-tests-package: - name: Test Ubuntu 20.04 Arm64 Package Downloads (package) + ubuntu-2004-arm64-package-pkg-download-tests: + 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: - prepare-workflow @@ -2518,11 +2518,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - ubuntu-2204-pkg-download-tests-package: - name: Test Ubuntu 22.04 Package Downloads (package) + ubuntu-2204-package-pkg-download-tests: + 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 @@ -2537,11 +2537,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - ubuntu-2204-arm64-pkg-download-tests-package: - name: Test Ubuntu 22.04 Arm64 Package Downloads (package) + ubuntu-2204-arm64-package-pkg-download-tests: + 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 @@ -2556,11 +2556,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: package + pkg-type: package secrets: inherit - ubuntu-2204-pkg-download-tests-onedir: - name: Test Ubuntu 22.04 Package Downloads (onedir) + ubuntu-2204-onedir-pkg-download-tests: + name: Test Ubuntu 22.04 onedir Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2575,11 +2575,11 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: onedir + pkg-type: onedir secrets: inherit - ubuntu-2204-arm64-pkg-download-tests-onedir: - name: Test Ubuntu 22.04 Arm64 Package Downloads (onedir) + ubuntu-2204-arm64-onedir-pkg-download-tests: + name: Test Ubuntu 22.04 Arm64 onedir Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2594,10 +2594,10 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: onedir + pkg-type: onedir secrets: inherit - macos-12-pkg-download-tests: + macos-12-Package-pkg-download-tests: name: Test macOS 12 Package Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: @@ -2613,9 +2613,29 @@ jobs: environment: staging skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package secrets: inherit - windows-2022-nsis-amd64-pkg-download-tests: + macos-12-Onedir-pkg-download-tests: + name: Test macOS 12 Onedir 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-macos.yml + with: + distro-slug: macos-12 + platform: darwin + 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 }}" + pkg-type: onedir + secrets: inherit + + 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 amd64 NSIS Package Downloads needs: @@ -2626,7 +2646,7 @@ jobs: distro-slug: windows-2022 platform: windows arch: amd64 - pkg-type: NSIS + pkg-type: nsis cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging @@ -2634,7 +2654,7 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-msi-amd64-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 amd64 MSI Package Downloads needs: @@ -2645,7 +2665,26 @@ jobs: distro-slug: windows-2022 platform: windows arch: amd64 - pkg-type: MSI + 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 + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + secrets: inherit + + windows-2022-Onedir-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 amd64 Onedir Package Downloads + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: windows-2022 + platform: windows + arch: amd64 + pkg-type: onedir cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging @@ -2702,36 +2741,38 @@ jobs: - windows-2019-msi-pkg-tests - windows-2022-nsis-pkg-tests - windows-2022-msi-pkg-tests - - 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 - - windows-2022-nsis-amd64-pkg-download-tests - - windows-2022-msi-amd64-pkg-download-tests + - almalinux-8-package-pkg-download-tests + - almalinux-8-arm64-package-pkg-download-tests + - almalinux-9-package-pkg-download-tests + - almalinux-9-arm64-package-pkg-download-tests + - amazonlinux-2-package-pkg-download-tests + - amazonlinux-2-arm64-package-pkg-download-tests + - centos-7-package-pkg-download-tests + - centos-7-arm64-package-pkg-download-tests + - centosstream-8-package-pkg-download-tests + - centosstream-8-arm64-package-pkg-download-tests + - centosstream-9-package-pkg-download-tests + - centosstream-9-arm64-package-pkg-download-tests + - debian-10-package-pkg-download-tests + - debian-11-package-pkg-download-tests + - debian-11-arm64-package-pkg-download-tests + - fedora-37-package-pkg-download-tests + - fedora-37-arm64-package-pkg-download-tests + - fedora-38-package-pkg-download-tests + - fedora-38-arm64-package-pkg-download-tests + - photonos-3-package-pkg-download-tests + - photonos-4-package-pkg-download-tests + - ubuntu-2004-package-pkg-download-tests + - ubuntu-2004-arm64-package-pkg-download-tests + - ubuntu-2204-package-pkg-download-tests + - ubuntu-2204-arm64-package-pkg-download-tests + - ubuntu-2204-onedir-pkg-download-tests + - ubuntu-2204-arm64-onedir-pkg-download-tests + - macos-12-Package-pkg-download-tests + - macos-12-Onedir-pkg-download-tests + - windows-2022-NSIS-amd64-pkg-download-tests + - windows-2022-MSI-amd64-pkg-download-tests + - windows-2022-Onedir-amd64-pkg-download-tests environment: staging runs-on: - self-hosted diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja index 922ed46bc82..0bdbb791887 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja @@ -30,12 +30,12 @@ ) %> - <%- for slug, display_name, arch, type in linux_pkg_tests %> - <%- set job_name = "{}-pkg-download-tests-{}".format(slug.replace(".", ""), type) %> + <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> + <%- set job_name = "{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> - name: Test <{ display_name }> Package Downloads (<{ type }>) + name: Test <{ display_name }> <{ pkg_type }> Downloads <%- if gh_environment == "staging" %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> @@ -57,20 +57,21 @@ environment: <{ gh_environment }> skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - test-type: <{ type }> + pkg-type: <{ pkg_type.lower() }> secrets: inherit <%- endfor %> - <%- for slug, display_name, arch in ( - ("macos-12", "macOS 12", "x86_64"), + <%- for slug, display_name, arch, pkg_type in ( + ("macos-12", "macOS 12", "x86_64", "Package"), + ("macos-12", "macOS 12", "x86_64", "Onedir"), ) %> - <%- set job_name = "{}-pkg-download-tests".format(slug.replace(".", "")) %> + <%- set job_name = "{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> - name: Test <{ display_name }> Package Downloads + name: Test <{ display_name }> <{ pkg_type }> Downloads <%- if gh_environment == "staging" %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> @@ -92,15 +93,16 @@ environment: <{ gh_environment }> skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: <{ pkg_type.lower() }> secrets: inherit - <%- endfor %> + <%- endfor %> <%- for slug, display_name, arch in ( ("windows-2022", "Windows 2022", "amd64"), ) %> - <%- for pkg_type in ("NSIS", "MSI") %> - <%- set job_name = "{}-{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type.lower(), arch.lower()) %> + <%- for pkg_type in ("NSIS", "MSI", "Onedir") %> + <%- set job_name = "{}-{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type, arch.lower()) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> @@ -121,7 +123,7 @@ distro-slug: <{ slug }> platform: windows arch: <{ arch }> - pkg-type: <{ pkg_type }> + pkg-type: <{ pkg_type.lower() }> cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version_windows }> salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: <{ gh_environment }> diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index a5067de8b50..7aa5f65c04a 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -31,6 +31,10 @@ on: required: true type: string description: The latest salt release + pkg-type: + required: true + type: string + description: The type of artifact to download package-name: required: false type: string @@ -46,11 +50,6 @@ 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: package env: @@ -226,11 +225,11 @@ jobs: SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_ARTIFACT_TYPE: ${{ inputs.test-type }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_ARTIFACT_TYPE \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs - name: Run Package Download Tests @@ -244,11 +243,11 @@ jobs: SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_ARTIFACT_TYPE: ${{ inputs.test-type }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_ARTIFACT_TYPE \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - name: Combine Coverage Reports diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index ec985efbcee..fdd1ce63991 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -31,6 +31,10 @@ on: required: true type: string description: The latest salt release + pkg-type: + required: true + type: string + description: The type of artifact to download python-version: required: false type: string @@ -199,6 +203,7 @@ jobs: SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | sudo -E nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs @@ -220,6 +225,7 @@ jobs: SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | sudo -E nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 963372925d2..0e585f97e70 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -221,7 +221,6 @@ jobs: - name: Show System Info & Test Plan env: - INSTALL_TYPE: ${{ inputs.pkg-type }} SALT_RELEASE: "${{ inputs.salt-version }}" SALT_REPO_ARCH: ${{ inputs.arch }} LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" @@ -231,15 +230,15 @@ jobs: SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs - name: Run Package Download Tests env: - INSTALL_TYPE: ${{ inputs.pkg-type }} SALT_RELEASE: "${{ inputs.salt-version }}" SALT_REPO_ARCH: ${{ inputs.arch }} LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" @@ -249,10 +248,11 @@ jobs: SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - name: Combine Coverage Reports diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index ae12e8d001d..a3aec5812bc 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -82,8 +82,8 @@ def root_url(salt_release): @pytest.fixture(scope="module") -def artifact_type(): - return os.environ.get("DOWNLOAD_TEST_ARTIFACT_TYPE") +def package_type(): + return os.environ.get("DOWNLOAD_TEST_PACKAGE_TYPE") def get_salt_release(): @@ -150,7 +150,7 @@ def _setup_system( salt_release, gpg_key_name, repo_subpath, - artifact_type, + package_type, tmp_path_factory, onedir_install_path, ): @@ -230,7 +230,7 @@ def _setup_system( downloads_path=downloads_path, gpg_key_name=gpg_key_name, repo_subpath=repo_subpath, - artifact_type=artifact_type, + package_type=package_type, onedir_install_path=onedir_install_path, ) else: @@ -308,7 +308,7 @@ def setup_debian_family( downloads_path, gpg_key_name, repo_subpath, - artifact_type, + package_type, onedir_install_path, ): arch = os.environ.get("SALT_REPO_ARCH") or "amd64" @@ -316,7 +316,7 @@ def setup_debian_family( if ret.returncode != 0: pytest.fail(str(ret)) - if artifact_type == "package": + if package_type == "package": if arch == "aarch64": arch = "arm64" elif arch == "x86_64": @@ -386,88 +386,149 @@ def setup_debian_family( shell.run("tar", "xvf", str(onedir_location), "-C", str(onedir_extracted)) -def setup_macos(shell, root_url, salt_release, downloads_path, repo_subpath): - arch = os.environ.get("SALT_REPO_ARCH") or "x86_64" - if arch == "aarch64": - arch = "arm64" +def setup_macos( + shell, + root_url, + salt_release, + downloads_path, + repo_subpath, + package_type, + onedir_install_path, +): + if package_type == "package": + arch = os.environ.get("SALT_REPO_ARCH") or "x86_64" + if arch == "aarch64": + arch = "arm64" - if packaging.version.parse(salt_release) > packaging.version.parse("3005"): - mac_pkg = f"salt-{salt_release}-py3-{arch}.pkg" - if repo_subpath == "minor": - mac_pkg_url = f"{root_url}/macos/{repo_subpath}/{salt_release}/{mac_pkg}" + if packaging.version.parse(salt_release) > packaging.version.parse("3005"): + mac_pkg = f"salt-{salt_release}-py3-{arch}.pkg" + if repo_subpath == "minor": + mac_pkg_url = ( + f"{root_url}/macos/{repo_subpath}/{salt_release}/{mac_pkg}" + ) + else: + mac_pkg_url = f"{root_url}/macos/{repo_subpath}/{mac_pkg}" else: - mac_pkg_url = f"{root_url}/macos/{repo_subpath}/{mac_pkg}" + mac_pkg_url = f"{root_url}/macos/{salt_release}/{mac_pkg}" + mac_pkg = f"salt-{salt_release}-macos-{arch}.pkg" + + mac_pkg_path = downloads_path / mac_pkg + pytest.helpers.download_file(mac_pkg_url, mac_pkg_path) + + ret = shell.run( + "installer", + "-pkg", + str(mac_pkg_path), + "-target", + "/", + check=False, + ) + assert ret.returncode == 0, ret else: - mac_pkg_url = f"{root_url}/macos/{salt_release}/{mac_pkg}" - mac_pkg = f"salt-{salt_release}-macos-{arch}.pkg" + # We are testing the onedir download + onedir_name = f"salt-{salt_release}-onedir-darwin-{arch}.tar.xz" + if repo_subpath == "minor": + repo_url_base = f"{root_url}/onedir/{repo_subpath}/{salt_release}" + else: + repo_url_base = f"{root_url}/onedir/{repo_subpath}" + onedir_url = f"{repo_url_base}/{onedir_name}" + onedir_location = downloads_path / onedir_name + onedir_extracted = onedir_install_path - mac_pkg_path = downloads_path / mac_pkg - pytest.helpers.download_file(mac_pkg_url, mac_pkg_path) + try: + pytest.helpers.download_file(onedir_url, onedir_location) + except Exception as exc: + pytest.fail(f"Failed to download {onedir_url}: {exc}") - ret = shell.run( - "installer", - "-pkg", - str(mac_pkg_path), - "-target", - "/", - check=False, - ) - assert ret.returncode == 0, ret + shell.run("tar", "xvf", str(onedir_location), "-C", str(onedir_extracted)) @contextlib.contextmanager -def setup_windows(shell, root_url, salt_release, downloads_path, repo_subpath): +def setup_windows( + shell, + root_url, + salt_release, + downloads_path, + repo_subpath, + package_type, + onedir_install_path, +): try: - root_dir = pathlib.Path(r"C:\Program Files\Salt Project\Salt") + if package_type == "package": + root_dir = pathlib.Path(r"C:\Program Files\Salt Project\Salt") - arch = os.environ.get("SALT_REPO_ARCH") or "amd64" - install_type = os.environ.get("INSTALL_TYPE") or "msi" - if packaging.version.parse(salt_release) > packaging.version.parse("3005"): - if install_type.lower() == "nsis": - if arch.lower() != "x86": - arch = arch.upper() - win_pkg = f"Salt-Minion-{salt_release}-Py3-{arch}-Setup.exe" + arch = os.environ.get("SALT_REPO_ARCH") or "amd64" + if packaging.version.parse(salt_release) > packaging.version.parse("3005"): + if package_type.lower() == "nsis": + if arch.lower() != "x86": + arch = arch.upper() + win_pkg = f"Salt-Minion-{salt_release}-Py3-{arch}-Setup.exe" + else: + if arch.lower() != "x86": + arch = arch.upper() + win_pkg = f"Salt-Minion-{salt_release}-Py3-{arch}.msi" + if repo_subpath == "minor": + win_pkg_url = ( + f"{root_url}/windows/{repo_subpath}/{salt_release}/{win_pkg}" + ) + else: + win_pkg_url = f"{root_url}/windows/{repo_subpath}/{win_pkg}" + ssm_bin = root_dir / "ssm.exe" else: - if arch.lower() != "x86": - arch = arch.upper() - win_pkg = f"Salt-Minion-{salt_release}-Py3-{arch}.msi" - if repo_subpath == "minor": - win_pkg_url = ( - f"{root_url}/windows/{repo_subpath}/{salt_release}/{win_pkg}" + win_pkg = f"salt-{salt_release}-windows-{arch}.exe" + win_pkg_url = f"{root_url}/windows/{salt_release}/{win_pkg}" + ssm_bin = root_dir / "bin" / "ssm_bin" + + pkg_path = downloads_path / win_pkg + + pytest.helpers.download_file(win_pkg_url, pkg_path) + if package_type.lower() == "nsis": + ret = shell.run(str(pkg_path), "/start-minion=0", "/S", check=False) + else: + ret = shell.run( + "msiexec", "/qn", "/i", str(pkg_path), 'START_MINION=""' ) + assert ret.returncode == 0, ret + + log.debug("Removing installed salt-minion service") + ret = shell.run( + "cmd", + "/c", + str(ssm_bin), + "remove", + "salt-minion", + "confirm", + check=False, + ) + assert ret.returncode == 0, ret + else: + # We are testing the onedir download + onedir_name = f"salt-{salt_release}-onedir-windows-{arch}.tar.xz" + if repo_subpath == "minor": + repo_url_base = f"{root_url}/onedir/{repo_subpath}/{salt_release}" else: - win_pkg_url = f"{root_url}/windows/{repo_subpath}/{win_pkg}" - ssm_bin = root_dir / "ssm.exe" - else: - win_pkg = f"salt-{salt_release}-windows-{arch}.exe" - win_pkg_url = f"{root_url}/windows/{salt_release}/{win_pkg}" - ssm_bin = root_dir / "bin" / "ssm_bin" + repo_url_base = f"{root_url}/onedir/{repo_subpath}" + onedir_url = f"{repo_url_base}/{onedir_name}" + onedir_location = downloads_path / onedir_name + onedir_extracted = onedir_install_path - pkg_path = downloads_path / win_pkg + try: + pytest.helpers.download_file(onedir_url, onedir_location) + except Exception as exc: + pytest.fail(f"Failed to download {onedir_url}: {exc}") - pytest.helpers.download_file(win_pkg_url, pkg_path) - if install_type.lower() == "nsis": - ret = shell.run(str(pkg_path), "/start-minion=0", "/S", check=False) - else: - ret = shell.run("msiexec", "/qn", "/i", str(pkg_path), 'START_MINION=""') - assert ret.returncode == 0, ret - - log.debug("Removing installed salt-minion service") - ret = shell.run( - "cmd", "/c", str(ssm_bin), "remove", "salt-minion", "confirm", check=False - ) - assert ret.returncode == 0, ret + shell.run("tar", "xvf", str(onedir_location), "-C", str(onedir_extracted)) yield finally: # We need to uninstall the MSI packages, otherwise they will not install correctly - if install_type.lower() == "msi": + if package_type.lower() == "msi": ret = shell.run("msiexec", "/qn", "/x", str(pkg_path)) assert ret.returncode == 0, ret @pytest.fixture(scope="module") -def install_dir(_setup_system, artifact_type, onedir_install_path): - if artifact_type == "package": +def install_dir(_setup_system, package_type, onedir_install_path): + if package_type == "package": if platform.is_windows(): return pathlib.Path( os.getenv("ProgramFiles"), "Salt Project", "Salt" From c0c50581568c4e0e238cfc16f0189c53cc2a37ab Mon Sep 17 00:00:00 2001 From: MKLeb Date: Tue, 6 Jun 2023 09:52:27 -0400 Subject: [PATCH 08/14] provide the right arguments to `setup_windows` and `setup_macos` --- pkg/tests/download/test_pkg_download.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index a3aec5812bc..e56a5a89e6a 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -164,6 +164,8 @@ def _setup_system( salt_release=salt_release, downloads_path=downloads_path, repo_subpath=repo_subpath, + package_type=package_type, + onedir_install_path=onedir_install_path, ): yield else: @@ -174,6 +176,8 @@ def _setup_system( salt_release=salt_release, downloads_path=downloads_path, repo_subpath=repo_subpath, + package_type=package_type, + onedir_install_path=onedir_install_path, ) elif grains["os"] == "Amazon": setup_redhat_family( From 95d8e03a102f5871d86d784fa35d6f1765545e08 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Tue, 6 Jun 2023 14:45:07 -0400 Subject: [PATCH 09/14] Assign arch outside of the ifs --- pkg/tests/download/test_pkg_download.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index e56a5a89e6a..9317a7d5af8 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -399,8 +399,8 @@ def setup_macos( package_type, onedir_install_path, ): + arch = os.environ.get("SALT_REPO_ARCH") or "x86_64" if package_type == "package": - arch = os.environ.get("SALT_REPO_ARCH") or "x86_64" if arch == "aarch64": arch = "arm64" @@ -458,10 +458,10 @@ def setup_windows( onedir_install_path, ): try: + arch = os.environ.get("SALT_REPO_ARCH") or "amd64" if package_type == "package": root_dir = pathlib.Path(r"C:\Program Files\Salt Project\Salt") - arch = os.environ.get("SALT_REPO_ARCH") or "amd64" if packaging.version.parse(salt_release) > packaging.version.parse("3005"): if package_type.lower() == "nsis": if arch.lower() != "x86": From 6518cedcb5a9de896629a84077bcaaee166f5dab Mon Sep 17 00:00:00 2001 From: MKLeb Date: Wed, 7 Jun 2023 12:04:57 -0400 Subject: [PATCH 10/14] Windows has multiple package types, change the setup condition to reflect that --- pkg/tests/download/test_pkg_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index 9317a7d5af8..b2145d1a54a 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -459,7 +459,7 @@ def setup_windows( ): try: arch = os.environ.get("SALT_REPO_ARCH") or "amd64" - if package_type == "package": + if package_type != "onedir": root_dir = pathlib.Path(r"C:\Program Files\Salt Project\Salt") if packaging.version.parse(salt_release) > packaging.version.parse("3005"): From 1f5191ec656450af99d08958278deaf5559796c4 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Wed, 7 Jun 2023 14:32:01 -0400 Subject: [PATCH 11/14] Fix the condition in another spot --- pkg/tests/download/test_pkg_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index b2145d1a54a..7a6c008e248 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -532,7 +532,7 @@ def setup_windows( @pytest.fixture(scope="module") def install_dir(_setup_system, package_type, onedir_install_path): - if package_type == "package": + if package_type != "onedir": if platform.is_windows(): return pathlib.Path( os.getenv("ProgramFiles"), "Salt Project", "Salt" From e68ee534dabc5dc43ea2e9381ad3a38956d20fca Mon Sep 17 00:00:00 2001 From: MKLeb Date: Thu, 8 Jun 2023 11:39:38 -0400 Subject: [PATCH 12/14] Use unzip for the windows onedir archives after download --- pkg/tests/download/test_pkg_download.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index 7a6c008e248..25b2bd89051 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -507,7 +507,7 @@ def setup_windows( assert ret.returncode == 0, ret else: # We are testing the onedir download - onedir_name = f"salt-{salt_release}-onedir-windows-{arch}.tar.xz" + onedir_name = f"salt-{salt_release}-onedir-windows-{arch}.zip" if repo_subpath == "minor": repo_url_base = f"{root_url}/onedir/{repo_subpath}/{salt_release}" else: @@ -521,7 +521,7 @@ def setup_windows( except Exception as exc: pytest.fail(f"Failed to download {onedir_url}: {exc}") - shell.run("tar", "xvf", str(onedir_location), "-C", str(onedir_extracted)) + shell.run("unzip", str(onedir_location), "-d", str(onedir_extracted)) yield finally: # We need to uninstall the MSI packages, otherwise they will not install correctly From 3a04c8775d34fc13116c95644bef561769296c2a Mon Sep 17 00:00:00 2001 From: MKLeb Date: Thu, 8 Jun 2023 16:17:04 -0400 Subject: [PATCH 13/14] Change the job names to look nicer --- .github/workflows/release.yml | 128 +++++++++--------- .github/workflows/staging.yml | 128 +++++++++--------- .../test-pkg-repo-downloads.yml.jinja | 6 +- 3 files changed, 131 insertions(+), 131 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a32fd6731a..fa0a019a496 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -220,7 +220,7 @@ jobs: run: | tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }} - almalinux-8-package-pkg-download-tests: + almalinux-8-package-download-tests: name: Test Alma Linux 8 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -240,7 +240,7 @@ jobs: pkg-type: package secrets: inherit - almalinux-8-arm64-package-pkg-download-tests: + almalinux-8-arm64-package-download-tests: name: Test Alma Linux 8 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -260,7 +260,7 @@ jobs: pkg-type: package secrets: inherit - almalinux-9-package-pkg-download-tests: + almalinux-9-package-download-tests: name: Test Alma Linux 9 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -280,7 +280,7 @@ jobs: pkg-type: package secrets: inherit - almalinux-9-arm64-package-pkg-download-tests: + almalinux-9-arm64-package-download-tests: name: Test Alma Linux 9 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -300,7 +300,7 @@ jobs: pkg-type: package secrets: inherit - amazonlinux-2-package-pkg-download-tests: + amazonlinux-2-package-download-tests: name: Test Amazon Linux 2 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -320,7 +320,7 @@ jobs: pkg-type: package secrets: inherit - amazonlinux-2-arm64-package-pkg-download-tests: + amazonlinux-2-arm64-package-download-tests: name: Test Amazon Linux 2 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -340,7 +340,7 @@ jobs: pkg-type: package secrets: inherit - centos-7-package-pkg-download-tests: + centos-7-package-download-tests: name: Test CentOS 7 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -360,7 +360,7 @@ jobs: pkg-type: package secrets: inherit - centos-7-arm64-package-pkg-download-tests: + centos-7-arm64-package-download-tests: name: Test CentOS 7 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -380,7 +380,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-8-package-pkg-download-tests: + centosstream-8-package-download-tests: name: Test CentOS Stream 8 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -400,7 +400,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-8-arm64-package-pkg-download-tests: + centosstream-8-arm64-package-download-tests: name: Test CentOS Stream 8 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -420,7 +420,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-9-package-pkg-download-tests: + centosstream-9-package-download-tests: name: Test CentOS Stream 9 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -440,7 +440,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-9-arm64-package-pkg-download-tests: + centosstream-9-arm64-package-download-tests: name: Test CentOS Stream 9 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -460,7 +460,7 @@ jobs: pkg-type: package secrets: inherit - debian-10-package-pkg-download-tests: + debian-10-package-download-tests: name: Test Debian 10 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -480,7 +480,7 @@ jobs: pkg-type: package secrets: inherit - debian-11-package-pkg-download-tests: + debian-11-package-download-tests: name: Test Debian 11 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -500,7 +500,7 @@ jobs: pkg-type: package secrets: inherit - debian-11-arm64-package-pkg-download-tests: + debian-11-arm64-package-download-tests: name: Test Debian 11 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -520,7 +520,7 @@ jobs: pkg-type: package secrets: inherit - fedora-37-package-pkg-download-tests: + fedora-37-package-download-tests: name: Test Fedora 37 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -540,7 +540,7 @@ jobs: pkg-type: package secrets: inherit - fedora-37-arm64-package-pkg-download-tests: + fedora-37-arm64-package-download-tests: name: Test Fedora 37 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -560,7 +560,7 @@ jobs: pkg-type: package secrets: inherit - fedora-38-package-pkg-download-tests: + fedora-38-package-download-tests: name: Test Fedora 38 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -580,7 +580,7 @@ jobs: pkg-type: package secrets: inherit - fedora-38-arm64-package-pkg-download-tests: + fedora-38-arm64-package-download-tests: name: Test Fedora 38 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -600,7 +600,7 @@ jobs: pkg-type: package secrets: inherit - photonos-3-package-pkg-download-tests: + photonos-3-package-download-tests: name: Test Photon OS 3 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -620,7 +620,7 @@ jobs: pkg-type: package secrets: inherit - photonos-4-package-pkg-download-tests: + photonos-4-package-download-tests: name: Test Photon OS 4 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -640,7 +640,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2004-package-pkg-download-tests: + ubuntu-2004-package-download-tests: name: Test Ubuntu 20.04 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -660,7 +660,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2004-arm64-package-pkg-download-tests: + ubuntu-2004-arm64-package-download-tests: name: Test Ubuntu 20.04 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -680,7 +680,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2204-package-pkg-download-tests: + ubuntu-2204-package-download-tests: name: Test Ubuntu 22.04 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -700,7 +700,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2204-arm64-package-pkg-download-tests: + ubuntu-2204-arm64-package-download-tests: name: Test Ubuntu 22.04 Arm64 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -720,7 +720,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2204-onedir-pkg-download-tests: + ubuntu-2204-onedir-download-tests: name: Test Ubuntu 22.04 onedir Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -740,7 +740,7 @@ jobs: pkg-type: onedir secrets: inherit - ubuntu-2204-arm64-onedir-pkg-download-tests: + ubuntu-2204-arm64-onedir-download-tests: name: Test Ubuntu 22.04 Arm64 onedir Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -760,7 +760,7 @@ jobs: pkg-type: onedir secrets: inherit - macos-12-Package-pkg-download-tests: + macos-12-Package-download-tests: name: Test macOS 12 Package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -780,7 +780,7 @@ jobs: pkg-type: package secrets: inherit - macos-12-Onedir-pkg-download-tests: + macos-12-Onedir-download-tests: name: Test macOS 12 Onedir Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: @@ -800,7 +800,7 @@ jobs: pkg-type: onedir secrets: inherit - windows-2022-NSIS-amd64-pkg-download-tests: + windows-2022-NSIS-amd64-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} name: Test Windows 2022 amd64 NSIS Package Downloads needs: @@ -820,7 +820,7 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-MSI-amd64-pkg-download-tests: + windows-2022-MSI-amd64-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} name: Test Windows 2022 amd64 MSI Package Downloads needs: @@ -840,7 +840,7 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-Onedir-amd64-pkg-download-tests: + windows-2022-Onedir-amd64-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} name: Test Windows 2022 amd64 Onedir Package Downloads needs: @@ -871,38 +871,38 @@ jobs: - prepare-workflow - backup - publish-repositories - - almalinux-8-package-pkg-download-tests - - almalinux-8-arm64-package-pkg-download-tests - - almalinux-9-package-pkg-download-tests - - almalinux-9-arm64-package-pkg-download-tests - - amazonlinux-2-package-pkg-download-tests - - amazonlinux-2-arm64-package-pkg-download-tests - - centos-7-package-pkg-download-tests - - centos-7-arm64-package-pkg-download-tests - - centosstream-8-package-pkg-download-tests - - centosstream-8-arm64-package-pkg-download-tests - - centosstream-9-package-pkg-download-tests - - centosstream-9-arm64-package-pkg-download-tests - - debian-10-package-pkg-download-tests - - debian-11-package-pkg-download-tests - - debian-11-arm64-package-pkg-download-tests - - fedora-37-package-pkg-download-tests - - fedora-37-arm64-package-pkg-download-tests - - fedora-38-package-pkg-download-tests - - fedora-38-arm64-package-pkg-download-tests - - photonos-3-package-pkg-download-tests - - photonos-4-package-pkg-download-tests - - ubuntu-2004-package-pkg-download-tests - - ubuntu-2004-arm64-package-pkg-download-tests - - ubuntu-2204-package-pkg-download-tests - - ubuntu-2204-arm64-package-pkg-download-tests - - ubuntu-2204-onedir-pkg-download-tests - - ubuntu-2204-arm64-onedir-pkg-download-tests - - macos-12-Package-pkg-download-tests - - macos-12-Onedir-pkg-download-tests - - windows-2022-NSIS-amd64-pkg-download-tests - - windows-2022-MSI-amd64-pkg-download-tests - - windows-2022-Onedir-amd64-pkg-download-tests + - almalinux-8-package-download-tests + - almalinux-8-arm64-package-download-tests + - almalinux-9-package-download-tests + - almalinux-9-arm64-package-download-tests + - amazonlinux-2-package-download-tests + - amazonlinux-2-arm64-package-download-tests + - centos-7-package-download-tests + - centos-7-arm64-package-download-tests + - centosstream-8-package-download-tests + - centosstream-8-arm64-package-download-tests + - centosstream-9-package-download-tests + - centosstream-9-arm64-package-download-tests + - debian-10-package-download-tests + - debian-11-package-download-tests + - debian-11-arm64-package-download-tests + - fedora-37-package-download-tests + - fedora-37-arm64-package-download-tests + - fedora-38-package-download-tests + - fedora-38-arm64-package-download-tests + - photonos-3-package-download-tests + - photonos-4-package-download-tests + - ubuntu-2004-package-download-tests + - ubuntu-2004-arm64-package-download-tests + - ubuntu-2204-package-download-tests + - ubuntu-2204-arm64-package-download-tests + - ubuntu-2204-onedir-download-tests + - ubuntu-2204-arm64-onedir-download-tests + - macos-12-Package-download-tests + - macos-12-Onedir-download-tests + - windows-2022-NSIS-amd64-download-tests + - windows-2022-MSI-amd64-download-tests + - windows-2022-Onedir-amd64-download-tests environment: release steps: - name: Clone The Salt Repository diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 35abe7d8272..6e973e8d143 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2084,7 +2084,7 @@ jobs: retention-days: 7 if-no-files-found: error - almalinux-8-package-pkg-download-tests: + almalinux-8-package-download-tests: 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: @@ -2103,7 +2103,7 @@ jobs: pkg-type: package secrets: inherit - almalinux-8-arm64-package-pkg-download-tests: + almalinux-8-arm64-package-download-tests: 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: @@ -2122,7 +2122,7 @@ jobs: pkg-type: package secrets: inherit - almalinux-9-package-pkg-download-tests: + almalinux-9-package-download-tests: 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: @@ -2141,7 +2141,7 @@ jobs: pkg-type: package secrets: inherit - almalinux-9-arm64-package-pkg-download-tests: + almalinux-9-arm64-package-download-tests: 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: @@ -2160,7 +2160,7 @@ jobs: pkg-type: package secrets: inherit - amazonlinux-2-package-pkg-download-tests: + amazonlinux-2-package-download-tests: 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: @@ -2179,7 +2179,7 @@ jobs: pkg-type: package secrets: inherit - amazonlinux-2-arm64-package-pkg-download-tests: + amazonlinux-2-arm64-package-download-tests: 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: @@ -2198,7 +2198,7 @@ jobs: pkg-type: package secrets: inherit - centos-7-package-pkg-download-tests: + centos-7-package-download-tests: 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: @@ -2217,7 +2217,7 @@ jobs: pkg-type: package secrets: inherit - centos-7-arm64-package-pkg-download-tests: + centos-7-arm64-package-download-tests: 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: @@ -2236,7 +2236,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-8-package-pkg-download-tests: + centosstream-8-package-download-tests: 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: @@ -2255,7 +2255,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-8-arm64-package-pkg-download-tests: + centosstream-8-arm64-package-download-tests: 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: @@ -2274,7 +2274,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-9-package-pkg-download-tests: + centosstream-9-package-download-tests: 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: @@ -2293,7 +2293,7 @@ jobs: pkg-type: package secrets: inherit - centosstream-9-arm64-package-pkg-download-tests: + centosstream-9-arm64-package-download-tests: 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: @@ -2312,7 +2312,7 @@ jobs: pkg-type: package secrets: inherit - debian-10-package-pkg-download-tests: + debian-10-package-download-tests: 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: @@ -2331,7 +2331,7 @@ jobs: pkg-type: package secrets: inherit - debian-11-package-pkg-download-tests: + debian-11-package-download-tests: 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: @@ -2350,7 +2350,7 @@ jobs: pkg-type: package secrets: inherit - debian-11-arm64-package-pkg-download-tests: + debian-11-arm64-package-download-tests: 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: @@ -2369,7 +2369,7 @@ jobs: pkg-type: package secrets: inherit - fedora-37-package-pkg-download-tests: + fedora-37-package-download-tests: 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: @@ -2388,7 +2388,7 @@ jobs: pkg-type: package secrets: inherit - fedora-37-arm64-package-pkg-download-tests: + fedora-37-arm64-package-download-tests: 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: @@ -2407,7 +2407,7 @@ jobs: pkg-type: package secrets: inherit - fedora-38-package-pkg-download-tests: + fedora-38-package-download-tests: 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: @@ -2426,7 +2426,7 @@ jobs: pkg-type: package secrets: inherit - fedora-38-arm64-package-pkg-download-tests: + fedora-38-arm64-package-download-tests: 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: @@ -2445,7 +2445,7 @@ jobs: pkg-type: package secrets: inherit - photonos-3-package-pkg-download-tests: + photonos-3-package-download-tests: 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: @@ -2464,7 +2464,7 @@ jobs: pkg-type: package secrets: inherit - photonos-4-package-pkg-download-tests: + photonos-4-package-download-tests: 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: @@ -2483,7 +2483,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2004-package-pkg-download-tests: + ubuntu-2004-package-download-tests: 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: @@ -2502,7 +2502,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2004-arm64-package-pkg-download-tests: + ubuntu-2004-arm64-package-download-tests: 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: @@ -2521,7 +2521,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2204-package-pkg-download-tests: + ubuntu-2204-package-download-tests: 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: @@ -2540,7 +2540,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2204-arm64-package-pkg-download-tests: + ubuntu-2204-arm64-package-download-tests: 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: @@ -2559,7 +2559,7 @@ jobs: pkg-type: package secrets: inherit - ubuntu-2204-onedir-pkg-download-tests: + ubuntu-2204-onedir-download-tests: name: Test Ubuntu 22.04 onedir Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: @@ -2578,7 +2578,7 @@ jobs: pkg-type: onedir secrets: inherit - ubuntu-2204-arm64-onedir-pkg-download-tests: + ubuntu-2204-arm64-onedir-download-tests: name: Test Ubuntu 22.04 Arm64 onedir Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: @@ -2597,7 +2597,7 @@ jobs: pkg-type: onedir secrets: inherit - macos-12-Package-pkg-download-tests: + macos-12-Package-download-tests: name: Test macOS 12 Package Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: @@ -2616,7 +2616,7 @@ jobs: pkg-type: package secrets: inherit - macos-12-Onedir-pkg-download-tests: + macos-12-Onedir-download-tests: name: Test macOS 12 Onedir Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: @@ -2635,7 +2635,7 @@ jobs: pkg-type: onedir secrets: inherit - windows-2022-NSIS-amd64-pkg-download-tests: + windows-2022-NSIS-amd64-download-tests: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} name: Test Windows 2022 amd64 NSIS Package Downloads needs: @@ -2654,7 +2654,7 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-MSI-amd64-pkg-download-tests: + windows-2022-MSI-amd64-download-tests: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} name: Test Windows 2022 amd64 MSI Package Downloads needs: @@ -2673,7 +2673,7 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-Onedir-amd64-pkg-download-tests: + windows-2022-Onedir-amd64-download-tests: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} name: Test Windows 2022 amd64 Onedir Package Downloads needs: @@ -2741,38 +2741,38 @@ jobs: - windows-2019-msi-pkg-tests - windows-2022-nsis-pkg-tests - windows-2022-msi-pkg-tests - - almalinux-8-package-pkg-download-tests - - almalinux-8-arm64-package-pkg-download-tests - - almalinux-9-package-pkg-download-tests - - almalinux-9-arm64-package-pkg-download-tests - - amazonlinux-2-package-pkg-download-tests - - amazonlinux-2-arm64-package-pkg-download-tests - - centos-7-package-pkg-download-tests - - centos-7-arm64-package-pkg-download-tests - - centosstream-8-package-pkg-download-tests - - centosstream-8-arm64-package-pkg-download-tests - - centosstream-9-package-pkg-download-tests - - centosstream-9-arm64-package-pkg-download-tests - - debian-10-package-pkg-download-tests - - debian-11-package-pkg-download-tests - - debian-11-arm64-package-pkg-download-tests - - fedora-37-package-pkg-download-tests - - fedora-37-arm64-package-pkg-download-tests - - fedora-38-package-pkg-download-tests - - fedora-38-arm64-package-pkg-download-tests - - photonos-3-package-pkg-download-tests - - photonos-4-package-pkg-download-tests - - ubuntu-2004-package-pkg-download-tests - - ubuntu-2004-arm64-package-pkg-download-tests - - ubuntu-2204-package-pkg-download-tests - - ubuntu-2204-arm64-package-pkg-download-tests - - ubuntu-2204-onedir-pkg-download-tests - - ubuntu-2204-arm64-onedir-pkg-download-tests - - macos-12-Package-pkg-download-tests - - macos-12-Onedir-pkg-download-tests - - windows-2022-NSIS-amd64-pkg-download-tests - - windows-2022-MSI-amd64-pkg-download-tests - - windows-2022-Onedir-amd64-pkg-download-tests + - almalinux-8-package-download-tests + - almalinux-8-arm64-package-download-tests + - almalinux-9-package-download-tests + - almalinux-9-arm64-package-download-tests + - amazonlinux-2-package-download-tests + - amazonlinux-2-arm64-package-download-tests + - centos-7-package-download-tests + - centos-7-arm64-package-download-tests + - centosstream-8-package-download-tests + - centosstream-8-arm64-package-download-tests + - centosstream-9-package-download-tests + - centosstream-9-arm64-package-download-tests + - debian-10-package-download-tests + - debian-11-package-download-tests + - debian-11-arm64-package-download-tests + - fedora-37-package-download-tests + - fedora-37-arm64-package-download-tests + - fedora-38-package-download-tests + - fedora-38-arm64-package-download-tests + - photonos-3-package-download-tests + - photonos-4-package-download-tests + - ubuntu-2004-package-download-tests + - ubuntu-2004-arm64-package-download-tests + - ubuntu-2204-package-download-tests + - ubuntu-2204-arm64-package-download-tests + - ubuntu-2204-onedir-download-tests + - ubuntu-2204-arm64-onedir-download-tests + - macos-12-Package-download-tests + - macos-12-Onedir-download-tests + - windows-2022-NSIS-amd64-download-tests + - windows-2022-MSI-amd64-download-tests + - windows-2022-Onedir-amd64-download-tests environment: staging runs-on: - self-hosted diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja index 0bdbb791887..964d7dce3c6 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja @@ -31,7 +31,7 @@ <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> - <%- set job_name = "{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type) %> + <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> @@ -67,7 +67,7 @@ ("macos-12", "macOS 12", "x86_64", "Package"), ("macos-12", "macOS 12", "x86_64", "Onedir"), ) %> - <%- set job_name = "{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type) %> + <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> @@ -102,7 +102,7 @@ ("windows-2022", "Windows 2022", "amd64"), ) %> <%- for pkg_type in ("NSIS", "MSI", "Onedir") %> - <%- set job_name = "{}-{}-{}-pkg-download-tests".format(slug.replace(".", ""), pkg_type, arch.lower()) %> + <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type, arch.lower()) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> From d1c28baf76f78b69a5287aee22402fca8111c7f8 Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Mon, 12 Jun 2023 15:25:41 -0500 Subject: [PATCH 14/14] Fix Slack notifications on nightly builds and link --- .github/workflows/nightly.yml | 4 ++-- .github/workflows/templates/nightly.yml.jinja | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c3c8325809f..493f02033af 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2103,13 +2103,13 @@ jobs: with: payload: | { - "text": "Nightly Workflow build result: ${{ job.status }}\n${{ github.event.head_commit.url }}", + "text": "Nightly Workflow build result for the ${{ github.ref_name }} branch: ${{ steps.get-workflow-info.outputs.conclusion }}\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}", "blocks": [ { "type": "section", "text": { "type": "mrkdwn", - "text": "GitHub Action build result: ${{ job.status }}\n${{ github.event.head_commit.url }}" + "text": "Nightly Workflow build result for the ${{ github.ref_name }} branch: ${{ steps.get-workflow-info.outputs.conclusion }}\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" } } ] diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja index 7e45a21f4f6..0aa970a27ae 100644 --- a/.github/workflows/templates/nightly.yml.jinja +++ b/.github/workflows/templates/nightly.yml.jinja @@ -127,13 +127,13 @@ concurrency: with: payload: | { - "text": "Nightly Workflow build result: ${{ job.status }}\n${{ github.event.head_commit.url }}", + "text": "Nightly Workflow build result for the ${{ github.ref_name }} branch: ${{ steps.get-workflow-info.outputs.conclusion }}\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}", "blocks": [ { "type": "section", "text": { "type": "mrkdwn", - "text": "GitHub Action build result: ${{ job.status }}\n${{ github.event.head_commit.url }}" + "text": "Nightly Workflow build result for the ${{ github.ref_name }} branch: ${{ steps.get-workflow-info.outputs.conclusion }}\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" } } ]