Reuse the onedir CI virtualenvs

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-09-27 13:02:01 +01:00 committed by Pedro Algarvio
parent 0fde37e4d5
commit ac7db60b86
13 changed files with 188 additions and 54 deletions

View file

@ -518,6 +518,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: amazonlinux-2
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -537,6 +538,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -556,6 +558,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -575,6 +578,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -594,6 +598,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-10
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -613,6 +618,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -632,6 +638,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -651,6 +658,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -670,6 +678,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -689,6 +698,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -708,6 +718,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -727,6 +738,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -746,6 +758,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -765,6 +778,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -784,6 +798,7 @@ jobs:
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -803,6 +818,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -822,6 +838,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -841,6 +858,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -860,6 +878,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -879,6 +898,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -898,6 +918,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"

View file

@ -573,6 +573,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: amazonlinux-2
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -592,6 +593,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -611,6 +613,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -630,6 +633,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -649,6 +653,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-10
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -668,6 +673,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -687,6 +693,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -706,6 +713,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -725,6 +733,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -744,6 +753,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -763,6 +773,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -782,6 +793,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -801,6 +813,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -820,6 +833,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -839,6 +853,7 @@ jobs:
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -858,6 +873,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -877,6 +893,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -896,6 +913,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -915,6 +933,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -934,6 +953,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -953,6 +973,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"

View file

@ -233,6 +233,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -254,6 +255,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -275,6 +277,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -296,6 +299,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -317,6 +321,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: amazonlinux-2
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -338,6 +343,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: amazonlinux-2-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -359,6 +365,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -380,6 +387,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centos-7-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -401,6 +409,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -422,6 +431,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -443,6 +453,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -464,6 +475,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -485,6 +497,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: debian-10
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -506,6 +519,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: debian-11
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -527,6 +541,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: debian-11-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -548,6 +563,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-37
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -569,6 +585,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-37-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -590,6 +607,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-38
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -611,6 +629,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-38-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -632,6 +651,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -653,6 +673,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: photonos-4
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -674,6 +695,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: photonos-4-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -695,6 +717,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-20.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -716,6 +739,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-20.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -737,6 +761,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -758,6 +783,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -779,6 +805,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -800,6 +827,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -821,6 +849,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -842,6 +871,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -863,6 +893,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-windows.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
pkg-type: nsis
@ -884,6 +915,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-windows.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
pkg-type: msi
@ -905,6 +937,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-windows.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
pkg-type: onedir

View file

@ -552,6 +552,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: amazonlinux-2
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -571,6 +572,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -590,6 +592,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -609,6 +612,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -628,6 +632,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-10
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -647,6 +652,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -666,6 +672,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -685,6 +692,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -704,6 +712,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -723,6 +732,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -742,6 +752,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -761,6 +772,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -780,6 +792,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -799,6 +812,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -818,6 +832,7 @@ jobs:
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -837,6 +852,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -856,6 +872,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -875,6 +892,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -894,6 +912,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -913,6 +932,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -932,6 +952,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"

View file

@ -568,6 +568,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: amazonlinux-2
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -587,6 +588,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -606,6 +608,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -625,6 +628,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -644,6 +648,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-10
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -663,6 +668,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -682,6 +688,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -701,6 +708,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -720,6 +728,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -739,6 +748,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: photonos-4-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -758,6 +768,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -777,6 +788,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -796,6 +808,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -815,6 +828,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -834,6 +848,7 @@ jobs:
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -853,6 +868,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -872,6 +888,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2016
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -891,6 +908,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -910,6 +928,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2019
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -929,6 +948,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -948,6 +968,7 @@ jobs:
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -2170,6 +2191,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2190,6 +2212,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2210,6 +2233,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2230,6 +2254,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: almalinux-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2250,6 +2275,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: amazonlinux-2
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2270,6 +2296,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: amazonlinux-2-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2290,6 +2317,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2310,6 +2338,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centos-7-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2330,6 +2359,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2350,6 +2380,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2370,6 +2401,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2390,6 +2422,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: centosstream-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2410,6 +2443,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: debian-10
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2430,6 +2464,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: debian-11
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2450,6 +2485,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: debian-11-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2470,6 +2506,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-37
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2490,6 +2527,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-37-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2510,6 +2548,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-38
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2530,6 +2569,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: fedora-38-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2550,6 +2590,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2570,6 +2611,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: photonos-4
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2590,6 +2632,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: photonos-4-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2610,6 +2653,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-20.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2630,6 +2674,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-20.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2650,6 +2695,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2670,6 +2716,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2690,6 +2737,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04
nox-session: ci-test-onedir
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2710,6 +2758,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: ubuntu-22.04-arm64
nox-session: ci-test-onedir
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2730,6 +2779,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2750,6 +2800,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-macos.yml
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@ -2770,6 +2821,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-windows.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
pkg-type: nsis
@ -2790,6 +2842,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-windows.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
pkg-type: msi
@ -2810,6 +2863,7 @@ jobs:
uses: ./.github/workflows/test-package-downloads-action-windows.yml
with:
distro-slug: windows-2022
nox-session: ci-test-onedir
platform: windows
arch: amd64
pkg-type: onedir

View file

@ -51,6 +51,7 @@
uses: ./.github/workflows/test-package-downloads-action-linux.yml
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: linux
arch: <{ arch }>
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
@ -88,6 +89,7 @@
uses: ./.github/workflows/test-package-downloads-action-macos.yml
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: darwin
arch: <{ arch }>
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
@ -124,6 +126,7 @@
uses: ./.github/workflows/test-package-downloads-action-windows.yml
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: windows
arch: <{ arch }>
pkg-type: <{ pkg_type.lower() }>

View file

@ -47,6 +47,7 @@
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: linux
arch: <{ arch }>
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -74,6 +75,7 @@
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: darwin
arch: <{ arch }>
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -103,6 +105,7 @@
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: windows
arch: <{ arch }>
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"

View file

@ -53,7 +53,7 @@ on:
required: false
type: string
description: The nox session to run
default: test-pkgs-onedir
default: ci-test-onedir
env:
@ -149,12 +149,6 @@ jobs:
run: |
tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v3
with:
name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-download-${{ inputs.arch }}
path: nox.${{ inputs.distro-slug }}.tar.*
test:
name: Test
runs-on:
@ -233,7 +227,7 @@ jobs:
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_PACKAGE_TYPE \
--nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs
--nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs
- name: Run Package Download Tests
env:
@ -251,7 +245,7 @@ jobs:
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_PACKAGE_TYPE \
--nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
--nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
- name: Combine Coverage Reports
if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled'

View file

@ -58,7 +58,7 @@ on:
required: false
type: string
description: The nox session to run
default: test-pkgs-onedir
default: ci-test-onedir
env:
@ -138,12 +138,6 @@ jobs:
run: |
nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v3
with:
name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-download-${{ inputs.arch }}
path: nox.${{ inputs.distro-slug }}.tar.*
test:
name: Test
runs-on: ${{ inputs.distro-slug }}
@ -208,7 +202,7 @@ jobs:
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
sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs
- name: Run Package Download Tests
env:
@ -231,7 +225,7 @@ jobs:
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
sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs
- name: Fix file ownership
run: |

View file

@ -48,7 +48,7 @@ on:
required: false
type: string
description: The nox session to run
default: test-pkgs-onedir
default: ci-test-onedir
skip-code-coverage:
required: false
type: boolean
@ -154,12 +154,6 @@ jobs:
run: |
tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v3
with:
name: nox-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-${{ inputs.nox-session }}-download-${{ inputs.arch }}
path: nox.${{ inputs.distro-slug }}.tar.*
test:
name: Test
runs-on:
@ -238,7 +232,7 @@ jobs:
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_PACKAGE_TYPE \
--nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs
--nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs
- name: Run Package Download Tests
env:
@ -256,7 +250,7 @@ jobs:
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_PACKAGE_TYPE \
--nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
--nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
- name: Combine Coverage Reports
if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled'

View file

@ -49,7 +49,7 @@ on:
required: false
type: string
description: The nox session to run
default: test-pkgs-onedir
default: ci-test-onedir
skip-code-coverage:
required: false
type: boolean
@ -158,11 +158,6 @@ jobs:
run: |
nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v3
with:
name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ inputs.arch }}
path: nox.${{ inputs.distro-slug }}.tar.*
test:
name: Test
@ -237,7 +232,7 @@ jobs:
GITHUB_ACTIONS_PIPELINE: "1"
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
run: |
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \
sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.test-chunk }} \
${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
- name: Run Package Tests
@ -251,7 +246,7 @@ jobs:
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
run: |
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \
sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.test-chunk }} \
${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
- name: Fix file ownership

View file

@ -44,7 +44,7 @@ on:
required: false
type: string
description: The nox session to run
default: test-pkgs-onedir
default: ci-test-onedir
skip-code-coverage:
required: false
type: boolean
@ -173,20 +173,6 @@ jobs:
run: |
tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
- name: Define Nox Upload Artifact Name
id: nox-artifact-name
run: |
if [ "${{ contains(inputs.distro-slug, 'windows') }}" != "true" ]; then
echo "name=nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ inputs.arch }}" >> "${GITHUB_OUTPUT}"
else
echo "name=nox-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-${{ inputs.nox-session }}-${{ inputs.arch }}" >> "${GITHUB_OUTPUT}"
fi
- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v3
with:
name: ${{ steps.nox-artifact-name.outputs.name }}
path: nox.${{ inputs.distro-slug }}.tar.*
test:
name: Test
@ -267,13 +253,13 @@ jobs:
- name: Show System Info & Test Plan
run: |
tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \
--nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
--nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
- name: Run Package Tests
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
--nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
- name: Download Test Run Artifacts

View file

@ -1820,10 +1820,25 @@ def build(session):
@nox.session(
python=str(ONEDIR_PYTHON_PATH),
name="test-pkgs-onedir",
name="ci-test-onedir-pkgs",
venv_params=["--system-site-packages"],
)
def test_pkgs_onedir(session):
def ci_test_onedir_pkgs(session):
from nox.virtualenv import VirtualEnv
session_warn(session, "Replacing VirtualEnv instance...")
ci_test_onedir_path = REPO_ROOT / ".nox" / "ci-test-onedir"
session._runner.venv = VirtualEnv(
str(ci_test_onedir_path.relative_to(REPO_ROOT)),
interpreter=session._runner.func.python,
reuse_existing=True,
venv=session._runner.venv.venv_or_virtualenv == "venv",
venv_params=session._runner.venv.venv_params,
)
os.environ["VIRTUAL_ENV"] = session._runner.venv.location
session._runner.venv.create()
if not ONEDIR_ARTIFACT_PATH.exists():
session.error(
"The salt onedir artifact, expected to be in '{}', was not found".format(