mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #66515 from s0undt3ch/hotfix/merge-forward-into-3007.x
[3007.x] Merge 3006.x into 3007.x
This commit is contained in:
Pedro Algarvio
GitHub
commit
e39e606a72
23 changed files with 564 additions and 181 deletions
106
.github/workflows/ci.yml
vendored
106
.github/workflows/ci.yml
vendored
|
|
@ -1008,7 +1008,7 @@ jobs:
|
|||
|
||||
ubuntu-2204-arm64-pkg-tests:
|
||||
name: Ubuntu 22.04 Arm64 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-22.04-arm64') }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
|
|
@ -1027,6 +1027,48 @@ jobs:
|
|||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-pkg-tests:
|
||||
name: Ubuntu 24.04 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-24.04') }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-arm64-pkg-tests:
|
||||
name: Ubuntu 24.04 Arm64 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
macos-12-pkg-tests:
|
||||
name: macOS 12 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
|
||||
|
|
@ -1642,15 +1684,15 @@ jobs:
|
|||
workflow-slug: ci
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
fedora-39:
|
||||
name: Fedora 39 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'fedora-39') }}
|
||||
fedora-40:
|
||||
name: Fedora 40 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'fedora-40') }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: fedora-39
|
||||
distro-slug: fedora-40
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
|
|
@ -1921,7 +1963,7 @@ jobs:
|
|||
|
||||
ubuntu-2204-arm64:
|
||||
name: Ubuntu 22.04 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-22.04-arm64') }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
|
|
@ -1940,6 +1982,48 @@ jobs:
|
|||
workflow-slug: ci
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404:
|
||||
name: Ubuntu 24.04 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-24.04') }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
workflow-slug: ci
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404-arm64:
|
||||
name: Ubuntu 24.04 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
workflow-slug: ci
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
combine-all-code-coverage:
|
||||
name: Combine Code Coverage
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
|
||||
|
|
@ -1967,7 +2051,7 @@ jobs:
|
|||
- debian-11-arm64
|
||||
- debian-12
|
||||
- debian-12-arm64
|
||||
- fedora-39
|
||||
- fedora-40
|
||||
- opensuse-15
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
|
|
@ -1981,6 +2065,8 @@ jobs:
|
|||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
- ubuntu-2204-arm64
|
||||
- ubuntu-2404
|
||||
- ubuntu-2404-arm64
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
|
@ -2133,7 +2219,7 @@ jobs:
|
|||
- debian-11-arm64
|
||||
- debian-12
|
||||
- debian-12-arm64
|
||||
- fedora-39
|
||||
- fedora-40
|
||||
- opensuse-15
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
|
|
@ -2147,6 +2233,8 @@ jobs:
|
|||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
- ubuntu-2204-arm64
|
||||
- ubuntu-2404
|
||||
- ubuntu-2404-arm64
|
||||
- rockylinux-8-pkg-tests
|
||||
- rockylinux-8-arm64-pkg-tests
|
||||
- rockylinux-9-pkg-tests
|
||||
|
|
@ -2172,6 +2260,8 @@ jobs:
|
|||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
- ubuntu-2204-arm64-pkg-tests
|
||||
- ubuntu-2404-pkg-tests
|
||||
- ubuntu-2404-arm64-pkg-tests
|
||||
- macos-12-pkg-tests
|
||||
- macos-13-pkg-tests
|
||||
- macos-13-arm64-pkg-tests
|
||||
|
|
|
|||
110
.github/workflows/nightly.yml
vendored
110
.github/workflows/nightly.yml
vendored
|
|
@ -1092,6 +1092,48 @@ jobs:
|
|||
skip-code-coverage: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-pkg-tests:
|
||||
name: Ubuntu 24.04 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-arm64-pkg-tests:
|
||||
name: Ubuntu 24.04 Arm64 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
macos-12-pkg-tests:
|
||||
name: macOS 12 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
|
||||
|
|
@ -1707,15 +1749,15 @@ jobs:
|
|||
workflow-slug: nightly
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
fedora-39:
|
||||
name: Fedora 39 Test
|
||||
fedora-40:
|
||||
name: Fedora 40 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: fedora-39
|
||||
distro-slug: fedora-40
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
|
|
@ -2005,6 +2047,48 @@ jobs:
|
|||
workflow-slug: nightly
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404:
|
||||
name: Ubuntu 24.04 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
workflow-slug: nightly
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404-arm64:
|
||||
name: Ubuntu 24.04 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
workflow-slug: nightly
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
combine-all-code-coverage:
|
||||
name: Combine Code Coverage
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
|
||||
|
|
@ -2032,7 +2116,7 @@ jobs:
|
|||
- debian-11-arm64
|
||||
- debian-12
|
||||
- debian-12-arm64
|
||||
- fedora-39
|
||||
- fedora-40
|
||||
- opensuse-15
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
|
|
@ -2046,6 +2130,8 @@ jobs:
|
|||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
- ubuntu-2204-arm64
|
||||
- ubuntu-2404
|
||||
- ubuntu-2404-arm64
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
|
@ -2315,11 +2401,11 @@ jobs:
|
|||
arch: arm64
|
||||
- pkg-type: deb
|
||||
distro: ubuntu
|
||||
version: "23.04"
|
||||
version: "24.04"
|
||||
arch: x86_64
|
||||
- pkg-type: deb
|
||||
distro: ubuntu
|
||||
version: "23.04"
|
||||
version: "24.04"
|
||||
arch: arm64
|
||||
|
||||
steps:
|
||||
|
|
@ -2438,15 +2524,15 @@ jobs:
|
|||
arch: aarch64
|
||||
- pkg-type: rpm
|
||||
distro: fedora
|
||||
version: "39"
|
||||
version: "40"
|
||||
arch: x86_64
|
||||
- pkg-type: rpm
|
||||
distro: fedora
|
||||
version: "39"
|
||||
version: "40"
|
||||
arch: arm64
|
||||
- pkg-type: rpm
|
||||
distro: fedora
|
||||
version: "39"
|
||||
version: "40"
|
||||
arch: aarch64
|
||||
- pkg-type: rpm
|
||||
distro: photon
|
||||
|
|
@ -2950,7 +3036,7 @@ jobs:
|
|||
- debian-11-arm64
|
||||
- debian-12
|
||||
- debian-12-arm64
|
||||
- fedora-39
|
||||
- fedora-40
|
||||
- opensuse-15
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
|
|
@ -2964,6 +3050,8 @@ jobs:
|
|||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
- ubuntu-2204-arm64
|
||||
- ubuntu-2404
|
||||
- ubuntu-2404-arm64
|
||||
|
||||
steps:
|
||||
|
||||
|
|
@ -3047,6 +3135,8 @@ jobs:
|
|||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
- ubuntu-2204-arm64-pkg-tests
|
||||
- ubuntu-2404-pkg-tests
|
||||
- ubuntu-2404-arm64-pkg-tests
|
||||
- macos-12-pkg-tests
|
||||
- macos-13-pkg-tests
|
||||
- macos-13-arm64-pkg-tests
|
||||
|
|
|
|||
100
.github/workflows/scheduled.yml
vendored
100
.github/workflows/scheduled.yml
vendored
|
|
@ -1074,6 +1074,48 @@ jobs:
|
|||
skip-code-coverage: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-pkg-tests:
|
||||
name: Ubuntu 24.04 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-arm64-pkg-tests:
|
||||
name: Ubuntu 24.04 Arm64 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
macos-12-pkg-tests:
|
||||
name: macOS 12 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
|
||||
|
|
@ -1689,15 +1731,15 @@ jobs:
|
|||
workflow-slug: scheduled
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
fedora-39:
|
||||
name: Fedora 39 Test
|
||||
fedora-40:
|
||||
name: Fedora 40 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: fedora-39
|
||||
distro-slug: fedora-40
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
|
|
@ -1987,6 +2029,48 @@ jobs:
|
|||
workflow-slug: scheduled
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404:
|
||||
name: Ubuntu 24.04 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
workflow-slug: scheduled
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404-arm64:
|
||||
name: Ubuntu 24.04 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: false
|
||||
workflow-slug: scheduled
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
combine-all-code-coverage:
|
||||
name: Combine Code Coverage
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
|
||||
|
|
@ -2014,7 +2098,7 @@ jobs:
|
|||
- debian-11-arm64
|
||||
- debian-12
|
||||
- debian-12-arm64
|
||||
- fedora-39
|
||||
- fedora-40
|
||||
- opensuse-15
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
|
|
@ -2028,6 +2112,8 @@ jobs:
|
|||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
- ubuntu-2204-arm64
|
||||
- ubuntu-2404
|
||||
- ubuntu-2404-arm64
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
|
@ -2182,7 +2268,7 @@ jobs:
|
|||
- debian-11-arm64
|
||||
- debian-12
|
||||
- debian-12-arm64
|
||||
- fedora-39
|
||||
- fedora-40
|
||||
- opensuse-15
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
|
|
@ -2196,6 +2282,8 @@ jobs:
|
|||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
- ubuntu-2204-arm64
|
||||
- ubuntu-2404
|
||||
- ubuntu-2404-arm64
|
||||
- rockylinux-8-pkg-tests
|
||||
- rockylinux-8-arm64-pkg-tests
|
||||
- rockylinux-9-pkg-tests
|
||||
|
|
@ -2221,6 +2309,8 @@ jobs:
|
|||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
- ubuntu-2204-arm64-pkg-tests
|
||||
- ubuntu-2404-pkg-tests
|
||||
- ubuntu-2404-arm64-pkg-tests
|
||||
- macos-12-pkg-tests
|
||||
- macos-13-pkg-tests
|
||||
- macos-13-arm64-pkg-tests
|
||||
|
|
|
|||
106
.github/workflows/staging.yml
vendored
106
.github/workflows/staging.yml
vendored
|
|
@ -1074,6 +1074,48 @@ jobs:
|
|||
skip-code-coverage: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-pkg-tests:
|
||||
name: Ubuntu 24.04 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2404-arm64-pkg-tests:
|
||||
name: Ubuntu 24.04 Arm64 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-pkgs-onedir
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-packages-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: deb
|
||||
nox-version: 2022.8.7
|
||||
python-version: "3.10"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
macos-12-pkg-tests:
|
||||
name: macOS 12 Package Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
|
||||
|
|
@ -1689,15 +1731,15 @@ jobs:
|
|||
workflow-slug: staging
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
fedora-39:
|
||||
name: Fedora 39 Test
|
||||
fedora-40:
|
||||
name: Fedora 40 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: fedora-39
|
||||
distro-slug: fedora-40
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
|
|
@ -1987,6 +2029,48 @@ jobs:
|
|||
workflow-slug: staging
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404:
|
||||
name: Ubuntu 24.04 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: true
|
||||
workflow-slug: staging
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
ubuntu-2404-arm64:
|
||||
name: Ubuntu 24.04 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps
|
||||
uses: ./.github/workflows/test-action-linux.yml
|
||||
with:
|
||||
distro-slug: ubuntu-24.04-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: arm64
|
||||
nox-version: 2022.8.7
|
||||
gh-actions-python-version: "3.10"
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
|
||||
skip-code-coverage: true
|
||||
workflow-slug: staging
|
||||
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
|
||||
|
||||
build-src-repo:
|
||||
name: Build Repository
|
||||
environment: staging
|
||||
|
|
@ -2140,11 +2224,11 @@ jobs:
|
|||
arch: arm64
|
||||
- pkg-type: deb
|
||||
distro: ubuntu
|
||||
version: "23.04"
|
||||
version: "24.04"
|
||||
arch: x86_64
|
||||
- pkg-type: deb
|
||||
distro: ubuntu
|
||||
version: "23.04"
|
||||
version: "24.04"
|
||||
arch: arm64
|
||||
|
||||
steps:
|
||||
|
|
@ -2263,15 +2347,15 @@ jobs:
|
|||
arch: aarch64
|
||||
- pkg-type: rpm
|
||||
distro: fedora
|
||||
version: "39"
|
||||
version: "40"
|
||||
arch: x86_64
|
||||
- pkg-type: rpm
|
||||
distro: fedora
|
||||
version: "39"
|
||||
version: "40"
|
||||
arch: arm64
|
||||
- pkg-type: rpm
|
||||
distro: fedora
|
||||
version: "39"
|
||||
version: "40"
|
||||
arch: aarch64
|
||||
- pkg-type: rpm
|
||||
distro: photon
|
||||
|
|
@ -2909,7 +2993,7 @@ jobs:
|
|||
- debian-11-arm64
|
||||
- debian-12
|
||||
- debian-12-arm64
|
||||
- fedora-39
|
||||
- fedora-40
|
||||
- opensuse-15
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
|
|
@ -2923,6 +3007,8 @@ jobs:
|
|||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
- ubuntu-2204-arm64
|
||||
- ubuntu-2404
|
||||
- ubuntu-2404-arm64
|
||||
- rockylinux-8-pkg-tests
|
||||
- rockylinux-8-arm64-pkg-tests
|
||||
- rockylinux-9-pkg-tests
|
||||
|
|
@ -2948,6 +3034,8 @@ jobs:
|
|||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
- ubuntu-2204-arm64-pkg-tests
|
||||
- ubuntu-2404-pkg-tests
|
||||
- ubuntu-2404-arm64-pkg-tests
|
||||
- macos-12-pkg-tests
|
||||
- macos-13-pkg-tests
|
||||
- macos-13-arm64-pkg-tests
|
||||
|
|
|
|||
1
changelog/66180.added.md
Normal file
1
changelog/66180.added.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
Add Ubuntu 24.04 support
|
||||
1
changelog/66300.added.md
Normal file
1
changelog/66300.added.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
Add Fedora 40 support, replacing Fedora 39
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"amazonlinux-2-arm64": {
|
||||
"ami": "ami-0fa1d515b17aa5832",
|
||||
"ami": "ami-0c98c023fba59d522",
|
||||
"ami_description": "CI Image of AmazonLinux 2 arm64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"amazonlinux-2": {
|
||||
"ami": "ami-0c9a41917d788911e",
|
||||
"ami": "ami-02cba95cfd7074794",
|
||||
"ami_description": "CI Image of AmazonLinux 2 x86_64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -20,9 +20,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"amazonlinux-2023-arm64": {
|
||||
"ami": "ami-00644e6cc81cb8fc0",
|
||||
"ami": "ami-0609f0e98f5a6b73d",
|
||||
"ami_description": "CI Image of AmazonLinux 2023 arm64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2023/arm64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2023/arm64/20240509.1529",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -30,9 +30,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"amazonlinux-2023": {
|
||||
"ami": "ami-01ba1cac2a9ba4845",
|
||||
"ami": "ami-0554a801eb6dcc42c",
|
||||
"ami_description": "CI Image of AmazonLinux 2023 x86_64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20240509.1529",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -40,9 +40,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"archlinux-lts": {
|
||||
"ami": "ami-01f729941d3262787",
|
||||
"ami": "ami-01ad78f19930b9747",
|
||||
"ami_description": "CI Image of ArchLinux lts x86_64",
|
||||
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20240209.1843",
|
||||
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -50,9 +50,9 @@
|
|||
"ssh_username": "arch"
|
||||
},
|
||||
"centos-7-arm64": {
|
||||
"ami": "ami-0a0c4ce5d61416643",
|
||||
"ami": "ami-0ef52419c91cb0169",
|
||||
"ami_description": "CI Image of CentOS 7 arm64",
|
||||
"ami_name": "salt-project/ci/centos/7/arm64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/centos/7/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -60,9 +60,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"centos-7": {
|
||||
"ami": "ami-06fec7a8fe157fe7d",
|
||||
"ami": "ami-0973c8d1b91dcba5c",
|
||||
"ami_description": "CI Image of CentOS 7 x86_64",
|
||||
"ami_name": "salt-project/ci/centos/7/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/centos/7/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -70,9 +70,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"debian-11-arm64": {
|
||||
"ami": "ami-0e1d6f34aaeba1e58",
|
||||
"ami": "ami-0eff227d9a94d8692",
|
||||
"ami_description": "CI Image of Debian 11 arm64",
|
||||
"ami_name": "salt-project/ci/debian/11/arm64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/debian/11/arm64/20240509.1529",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -80,9 +80,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-11": {
|
||||
"ami": "ami-012327dae48ce80ac",
|
||||
"ami": "ami-099b2a5a1fb995166",
|
||||
"ami_description": "CI Image of Debian 11 x86_64",
|
||||
"ami_name": "salt-project/ci/debian/11/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/debian/11/x86_64/20240509.1529",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -90,9 +90,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-12-arm64": {
|
||||
"ami": "ami-0527ef47cece68f54",
|
||||
"ami": "ami-0ab6b0cc8488f8880",
|
||||
"ami_description": "CI Image of Debian 12 arm64",
|
||||
"ami_name": "salt-project/ci/debian/12/arm64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/debian/12/arm64/20240509.1529",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -100,29 +100,29 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-12": {
|
||||
"ami": "ami-0d9d685ae10656958",
|
||||
"ami": "ami-0e1f5b55325249c4e",
|
||||
"ami_description": "CI Image of Debian 12 x86_64",
|
||||
"ami_name": "salt-project/ci/debian/12/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/debian/12/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "admin"
|
||||
},
|
||||
"fedora-39-arm64": {
|
||||
"ami": "ami-00d2f2e1fccac457d",
|
||||
"ami_description": "CI Image of Fedora 39 arm64",
|
||||
"ami_name": "salt-project/ci/fedora/39/arm64/20240325.2133",
|
||||
"fedora-40-arm64": {
|
||||
"ami": "ami-064df327a55f83953",
|
||||
"ami_description": "CI Image of Fedora 40 arm64",
|
||||
"ami_name": "salt-project/ci/fedora/40/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "fedora"
|
||||
},
|
||||
"fedora-39": {
|
||||
"ami": "ami-072c01a40a6519153",
|
||||
"ami_description": "CI Image of Fedora 39 x86_64",
|
||||
"ami_name": "salt-project/ci/fedora/39/x86_64/20240325.2133",
|
||||
"fedora-40": {
|
||||
"ami": "ami-08d8dbd4f063788de",
|
||||
"ami_description": "CI Image of Fedora 40 x86_64",
|
||||
"ami_name": "salt-project/ci/fedora/40/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -130,9 +130,9 @@
|
|||
"ssh_username": "fedora"
|
||||
},
|
||||
"opensuse-15": {
|
||||
"ami": "ami-04cfbfd3c214348bc",
|
||||
"ami": "ami-0f82d5ab3015af6ad",
|
||||
"ami_description": "CI Image of Opensuse 15 x86_64",
|
||||
"ami_name": "salt-project/ci/opensuse/15/x86_64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/opensuse/15/x86_64/20240509.1529",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -140,9 +140,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"photonos-4-arm64": {
|
||||
"ami": "ami-0bd76e6234ee685a7",
|
||||
"ami": "ami-0ea152c346cb8e13b",
|
||||
"ami_description": "CI Image of PhotonOS 4 arm64",
|
||||
"ami_name": "salt-project/ci/photonos/4/arm64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/photonos/4/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -150,9 +150,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-4": {
|
||||
"ami": "ami-0b1947785de4b2a6e",
|
||||
"ami": "ami-09b55d0bf3a1aa7e5",
|
||||
"ami_description": "CI Image of PhotonOS 4 x86_64",
|
||||
"ami_name": "salt-project/ci/photonos/4/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/photonos/4/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -160,9 +160,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-5-arm64": {
|
||||
"ami": "ami-0d02f34b9820752e4",
|
||||
"ami": "ami-09de4952bc9fc068a",
|
||||
"ami_description": "CI Image of PhotonOS 5 arm64",
|
||||
"ami_name": "salt-project/ci/photonos/5/arm64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/photonos/5/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -170,9 +170,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-5": {
|
||||
"ami": "ami-0fd58f07139e9622e",
|
||||
"ami": "ami-0c3375a583643fc77",
|
||||
"ami_description": "CI Image of PhotonOS 5 x86_64",
|
||||
"ami_name": "salt-project/ci/photonos/5/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/photonos/5/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -180,9 +180,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"rockylinux-8-arm64": {
|
||||
"ami": "ami-0e5d23f57141e5ac4",
|
||||
"ami": "ami-0662cc201cada14b8",
|
||||
"ami_description": "CI Image of RockyLinux 8 arm64",
|
||||
"ami_name": "salt-project/ci/rockylinux/8/arm64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/rockylinux/8/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -190,9 +190,9 @@
|
|||
"ssh_username": "rocky"
|
||||
},
|
||||
"rockylinux-8": {
|
||||
"ami": "ami-0e2cac6a847d700aa",
|
||||
"ami": "ami-071ca70a907d79e05",
|
||||
"ami_description": "CI Image of RockyLinux 8 x86_64",
|
||||
"ami_name": "salt-project/ci/rockylinux/8/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/rockylinux/8/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -200,9 +200,9 @@
|
|||
"ssh_username": "rocky"
|
||||
},
|
||||
"rockylinux-9-arm64": {
|
||||
"ami": "ami-0054d3b25a08d2b41",
|
||||
"ami": "ami-065842dfdf03a1a03",
|
||||
"ami_description": "CI Image of RockyLinux 9 arm64",
|
||||
"ami_name": "salt-project/ci/rockylinux/9/arm64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/rockylinux/9/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -210,9 +210,9 @@
|
|||
"ssh_username": "rocky"
|
||||
},
|
||||
"rockylinux-9": {
|
||||
"ami": "ami-042d3b81138968bdb",
|
||||
"ami": "ami-09f5d6df00e99ba16",
|
||||
"ami_description": "CI Image of RockyLinux 9 x86_64",
|
||||
"ami_name": "salt-project/ci/rockylinux/9/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/rockylinux/9/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -220,9 +220,9 @@
|
|||
"ssh_username": "rocky"
|
||||
},
|
||||
"ubuntu-20.04-arm64": {
|
||||
"ami": "ami-0bd2e3ee99c5a2f52",
|
||||
"ami": "ami-00171fa604b826054",
|
||||
"ami_description": "CI Image of Ubuntu 20.04 arm64",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -230,9 +230,9 @@
|
|||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-20.04": {
|
||||
"ami": "ami-0fdc19cb94bc96db3",
|
||||
"ami": "ami-07ddfbdc489064022",
|
||||
"ami_description": "CI Image of Ubuntu 20.04 x86_64",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -240,9 +240,9 @@
|
|||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-22.04-arm64": {
|
||||
"ami": "ami-0690e86bc116a6245",
|
||||
"ami": "ami-0e6b6fc1dd298e055",
|
||||
"ami_description": "CI Image of Ubuntu 22.04 arm64",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -250,29 +250,29 @@
|
|||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-22.04": {
|
||||
"ami": "ami-0285c21e3abc8b2b2",
|
||||
"ami": "ami-0736289579c0d01ba",
|
||||
"ami_description": "CI Image of Ubuntu 22.04 x86_64",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20240325.2134",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-23.04-arm64": {
|
||||
"ami": "ami-09e0eb04bbf2a2f35",
|
||||
"ami_description": "CI Image of Ubuntu 23.04 arm64",
|
||||
"ami_name": "salt-project/ci/ubuntu/23.04/arm64/20240325.2134",
|
||||
"ubuntu-24.04-arm64": {
|
||||
"ami": "ami-015058823f69446b3",
|
||||
"ami_description": "CI Image of Ubuntu 24.04 arm64",
|
||||
"ami_name": "salt-project/ci/ubuntu/24.04/arm64/20240509.1530",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-23.04": {
|
||||
"ami": "ami-029edca569b26d625",
|
||||
"ami_description": "CI Image of Ubuntu 23.04 x86_64",
|
||||
"ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20240325.2134",
|
||||
"ubuntu-24.04": {
|
||||
"ami": "ami-0eb04152e7cafaaf9",
|
||||
"ami_description": "CI Image of Ubuntu 24.04 x86_64",
|
||||
"ami_name": "salt-project/ci/ubuntu/24.04/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -280,9 +280,9 @@
|
|||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"windows-2016": {
|
||||
"ami": "ami-0474d8e7e13c81883",
|
||||
"ami": "ami-06026cb4d83072df5",
|
||||
"ami_description": "CI Image of Windows 2016 x86_64",
|
||||
"ami_name": "salt-project/ci/windows/2016/x86_64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/windows/2016/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.xlarge",
|
||||
|
|
@ -290,9 +290,9 @@
|
|||
"ssh_username": "Administrator"
|
||||
},
|
||||
"windows-2019": {
|
||||
"ami": "ami-07afee87d071123bf",
|
||||
"ami": "ami-095a9256ec0e8261c",
|
||||
"ami_description": "CI Image of Windows 2019 x86_64",
|
||||
"ami_name": "salt-project/ci/windows/2019/x86_64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/windows/2019/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.xlarge",
|
||||
|
|
@ -300,9 +300,9 @@
|
|||
"ssh_username": "Administrator"
|
||||
},
|
||||
"windows-2022": {
|
||||
"ami": "ami-08f69046343f92cc4",
|
||||
"ami": "ami-0d295c0711e513c05",
|
||||
"ami_description": "CI Image of Windows 2022 x86_64",
|
||||
"ami_name": "salt-project/ci/windows/2022/x86_64/20240325.2133",
|
||||
"ami_name": "salt-project/ci/windows/2022/x86_64/20240509.1530",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.xlarge",
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@ mandatory_os_slugs:
|
|||
- archlinux-lts
|
||||
- photonos-5-arm64
|
||||
- macos-12
|
||||
- ubuntu-22.04-arm64
|
||||
- ubuntu-24.04-arm64
|
||||
- windows-2022
|
||||
|
|
|
|||
|
|
@ -34,18 +34,18 @@ import pytest
|
|||
from tests.support.case import SSHCase
|
||||
|
||||
pytestmark = [
|
||||
pytest.mark.skip_on_windows,
|
||||
pytest.mark.skipif(
|
||||
"grains['osfinger'] == 'Fedora Linux-39'",
|
||||
reason="Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12",
|
||||
'grains["osfinger"].startswith(("Fedora Linux-40", "Ubuntu-24.04", "Arch Linux"))',
|
||||
reason="System ships with a version of python that is too recent for salt-ssh tests",
|
||||
# Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
|
||||
# and it imports `ssl` and checks if the `match_hostname` function is defined, which
|
||||
# has been deprecated since Python 3.7, so, the logic goes into trying to import
|
||||
# backports.ssl-match-hostname which is not installed on the system.
|
||||
)
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.skip_on_windows
|
||||
class SSHCustomModuleTest(SSHCase):
|
||||
"""
|
||||
Test sls with custom module functionality using ssh
|
||||
|
|
|
|||
|
|
@ -12,14 +12,16 @@ from tests.support.case import SSHCase
|
|||
from tests.support.runtests import RUNTIME_VARS
|
||||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.timeout_unless_on_windows(120),
|
||||
pytest.mark.skipif(
|
||||
"grains['osfinger'] == 'Fedora Linux-39'",
|
||||
reason="Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12",
|
||||
'grains["osfinger"].startswith(("Fedora Linux-40", "Ubuntu-24.04", "Arch Linux"))',
|
||||
reason="System ships with a version of python that is too recent for salt-ssh tests",
|
||||
# Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
|
||||
# and it imports `ssl` and checks if the `match_hostname` function is defined, which
|
||||
# has been deprecated since Python 3.7, so, the logic goes into trying to import
|
||||
# backports.ssl-match-hostname which is not installed on the system.
|
||||
)
|
||||
),
|
||||
]
|
||||
|
||||
SSH_SLS = "ssh_state_tests"
|
||||
|
|
@ -28,8 +30,6 @@ SSH_SLS_FILE = "/tmp/salt_test_file"
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@pytest.mark.slow_test
|
||||
@pytest.mark.timeout_unless_on_windows(120)
|
||||
class SSHStateTest(SSHCase):
|
||||
"""
|
||||
testing the state system with salt-ssh
|
||||
|
|
@ -55,7 +55,6 @@ class SSHStateTest(SSHCase):
|
|||
exp_ret=SSH_SLS,
|
||||
)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_apply(self):
|
||||
"""
|
||||
test state.apply with salt-ssh
|
||||
|
|
@ -66,7 +65,6 @@ class SSHStateTest(SSHCase):
|
|||
check_file = self.run_function("file.file_exists", [SSH_SLS_FILE])
|
||||
self.assertTrue(check_file)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_sls_id(self):
|
||||
"""
|
||||
test state.sls_id with salt-ssh
|
||||
|
|
@ -93,7 +91,6 @@ class SSHStateTest(SSHCase):
|
|||
check_file = self.run_function("file.file_exists", [SSH_SLS_FILE])
|
||||
self.assertTrue(check_file)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_sls_wrong_id(self):
|
||||
"""
|
||||
test state.sls_id when id does not exist
|
||||
|
|
@ -102,7 +99,6 @@ class SSHStateTest(SSHCase):
|
|||
ret = self.run_function("state.sls_id", ["doesnotexist", SSH_SLS])
|
||||
assert "No matches for ID" in ret
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_sls_id_with_pillar(self):
|
||||
"""
|
||||
test state.sls_id with pillar data
|
||||
|
|
@ -116,7 +112,6 @@ class SSHStateTest(SSHCase):
|
|||
)
|
||||
self.assertTrue(check_file)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_show_sls(self):
|
||||
"""
|
||||
test state.show_sls with salt-ssh
|
||||
|
|
@ -127,7 +122,6 @@ class SSHStateTest(SSHCase):
|
|||
check_file = self.run_function("file.file_exists", [SSH_SLS_FILE], wipe=False)
|
||||
self.assertFalse(check_file)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_show_top(self):
|
||||
"""
|
||||
test state.show_top with salt-ssh
|
||||
|
|
@ -154,7 +148,6 @@ class SSHStateTest(SSHCase):
|
|||
ret = self.run_function("state.show_top")
|
||||
self.assertEqual(ret, {"base": ["core", "master_tops_test"]})
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_single(self):
|
||||
"""
|
||||
state.single with salt-ssh
|
||||
|
|
@ -172,7 +165,6 @@ class SSHStateTest(SSHCase):
|
|||
self.assertEqual(value["result"], ret_out["result"])
|
||||
self.assertEqual(value["comment"], ret_out["comment"])
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_show_highstate(self):
|
||||
"""
|
||||
state.show_highstate with salt-ssh
|
||||
|
|
@ -202,7 +194,6 @@ class SSHStateTest(SSHCase):
|
|||
self.assertIn(destpath, high)
|
||||
self.assertEqual(high[destpath]["__env__"], "base")
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_high(self):
|
||||
"""
|
||||
state.high with salt-ssh
|
||||
|
|
@ -220,7 +211,6 @@ class SSHStateTest(SSHCase):
|
|||
self.assertEqual(value["result"], ret_out["result"])
|
||||
self.assertEqual(value["comment"], ret_out["comment"])
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_show_lowstate(self):
|
||||
"""
|
||||
state.show_lowstate with salt-ssh
|
||||
|
|
@ -248,7 +238,6 @@ class SSHStateTest(SSHCase):
|
|||
self.assertIsInstance(low, list)
|
||||
self.assertIsInstance(low[0], dict)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_low(self):
|
||||
"""
|
||||
state.low with salt-ssh
|
||||
|
|
@ -267,7 +256,6 @@ class SSHStateTest(SSHCase):
|
|||
self.assertEqual(value["result"], ret_out["result"])
|
||||
self.assertEqual(value["comment"], ret_out["comment"])
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_request_check_clear(self):
|
||||
"""
|
||||
test state.request system with salt-ssh
|
||||
|
|
@ -281,7 +269,6 @@ class SSHStateTest(SSHCase):
|
|||
clear = self.run_function("state.clear_request", wipe=False)
|
||||
self._check_request(empty=True)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_run_request(self):
|
||||
"""
|
||||
test state.request system with salt-ssh
|
||||
|
|
@ -295,7 +282,6 @@ class SSHStateTest(SSHCase):
|
|||
check_file = self.run_function("file.file_exists", [SSH_SLS_FILE], wipe=False)
|
||||
self.assertTrue(check_file)
|
||||
|
||||
@pytest.mark.slow_test
|
||||
def test_state_running(self):
|
||||
"""
|
||||
test state.running with salt-ssh
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import pytest
|
|||
pytestmark = [
|
||||
pytest.mark.skip_on_windows,
|
||||
pytest.mark.destructive_test,
|
||||
pytest.mark.timeout_unless_on_windows(240),
|
||||
]
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import pytest
|
|||
pytestmark = [
|
||||
pytest.mark.skip_on_windows,
|
||||
pytest.mark.destructive_test,
|
||||
pytest.mark.timeout_unless_on_windows(240),
|
||||
]
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import pytest
|
|||
pytestmark = [
|
||||
pytest.mark.skip_on_windows,
|
||||
pytest.mark.destructive_test,
|
||||
pytest.mark.timeout_unless_on_windows(240),
|
||||
]
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ def test_mod_del_repo(grains, modules):
|
|||
|
||||
try:
|
||||
# ppa:otto-kesselgulasch/gimp-edge has no Ubuntu 22.04 repo
|
||||
if grains["os"] == "Ubuntu" and grains["osmajorrelease"] != 22:
|
||||
if grains["os"] == "Ubuntu" and grains["osmajorrelease"] < 22:
|
||||
repo = "ppa:otto-kesselgulasch/gimp-edge"
|
||||
uri = "http://ppa.launchpad.net/otto-kesselgulasch/gimp-edge/ubuntu"
|
||||
ret = modules.pkg.mod_repo(repo, "comps=main")
|
||||
|
|
@ -213,11 +213,15 @@ def test_mod_del_repo_multiline_values(modules):
|
|||
|
||||
|
||||
@pytest.mark.requires_salt_modules("pkg.owner")
|
||||
def test_owner(modules):
|
||||
def test_owner(modules, grains):
|
||||
"""
|
||||
test finding the package owning a file
|
||||
"""
|
||||
ret = modules.pkg.owner("/bin/ls")
|
||||
binary = "/bin/ls"
|
||||
if grains["os"] == "Ubuntu" and grains["osmajorrelease"] >= 24:
|
||||
binary = "/usr/bin/ls"
|
||||
|
||||
ret = modules.pkg.owner(binary)
|
||||
assert len(ret) != 0
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import datetime
|
||||
import logging
|
||||
import os
|
||||
import shutil
|
||||
import signal
|
||||
import subprocess
|
||||
import textwrap
|
||||
|
|
@ -106,6 +107,9 @@ def hwclock_has_compare(cmdmod):
|
|||
systems where it's not present so that we can skip the
|
||||
comparison portion of the test.
|
||||
"""
|
||||
hwclock = shutil.which("hwclock")
|
||||
if hwclock is None:
|
||||
pytest.skip("The 'hwclock' binary could not be found")
|
||||
res = cmdmod.run_all(cmd="hwclock -h")
|
||||
_hwclock_has_compare_ = res["retcode"] == 0 and res["stdout"].find("--compare") > 0
|
||||
return _hwclock_has_compare_
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@ import os
|
|||
import pathlib
|
||||
import shutil
|
||||
import sys
|
||||
from sysconfig import get_path
|
||||
import sysconfig
|
||||
|
||||
import attr
|
||||
import pytest
|
||||
import requests
|
||||
|
||||
import salt.modules.aptpkg
|
||||
import salt.utils.files
|
||||
|
|
@ -123,7 +124,7 @@ def system_aptsources(request, grains):
|
|||
"{}".format(*sys.version_info),
|
||||
"{}.{}".format(*sys.version_info),
|
||||
]
|
||||
session_site_packages_dir = get_path(
|
||||
session_site_packages_dir = sysconfig.get_path(
|
||||
"purelib"
|
||||
) # note: platlib and purelib could differ
|
||||
session_site_packages_dir = os.path.relpath(
|
||||
|
|
@ -649,6 +650,7 @@ class Repo:
|
|||
key_file = attr.ib()
|
||||
sources_list_file = attr.ib()
|
||||
repo_file = attr.ib()
|
||||
repo_url = attr.ib()
|
||||
repo_content = attr.ib()
|
||||
key_url = attr.ib()
|
||||
|
||||
|
|
@ -686,6 +688,10 @@ class Repo:
|
|||
def _default_repo_file(self):
|
||||
return self.sources_list_file
|
||||
|
||||
@repo_url.default
|
||||
def _default_repo_url(self):
|
||||
return f"https://repo.saltproject.io/py3/{self.fullname}/{self.grains['osrelease']}/{self.grains['osarch']}/latest"
|
||||
|
||||
@repo_content.default
|
||||
def _default_repo_content(self):
|
||||
if self.alt_repo:
|
||||
|
|
@ -703,25 +709,26 @@ class Repo:
|
|||
opts = "[arch={arch} signed-by=/usr/share/keyrings/salt-archive-keyring.gpg]".format(
|
||||
arch=self.grains["osarch"]
|
||||
)
|
||||
repo_content = "deb {opts} https://repo.saltproject.io/py3/{}/{}/{arch}/latest {} main".format(
|
||||
self.fullname,
|
||||
self.grains["osrelease"],
|
||||
self.grains["oscodename"],
|
||||
arch=self.grains["osarch"],
|
||||
opts=opts,
|
||||
repo_content = (
|
||||
f"deb {opts} {self.repo_url} {self.grains['oscodename']} main"
|
||||
)
|
||||
return repo_content
|
||||
|
||||
@key_url.default
|
||||
def _default_key_url(self):
|
||||
key_url = "https://repo.saltproject.io/py3/{}/{}/{}/latest/salt-archive-keyring.gpg".format(
|
||||
self.fullname, self.grains["osrelease"], self.grains["osarch"]
|
||||
)
|
||||
|
||||
key_url = f"{self.repo_url}/salt-archive-keyring.gpg"
|
||||
if self.alt_repo:
|
||||
key_url = "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
|
||||
return key_url
|
||||
|
||||
@property
|
||||
def exists(self):
|
||||
"""
|
||||
Return True if the repository path exists.
|
||||
"""
|
||||
response = requests.head(self.key_url, timeout=30)
|
||||
return response.status_code == 200
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def repo(request, grains, sources_list_file):
|
||||
|
|
@ -729,10 +736,14 @@ def repo(request, grains, sources_list_file):
|
|||
if "signedby" in request.node.name:
|
||||
signedby = True
|
||||
repo = Repo(grains=grains, sources_list_file=sources_list_file, signedby=signedby)
|
||||
yield repo
|
||||
for key in [repo.key_file, repo.key_file.parent / "salt-alt-key.gpg"]:
|
||||
if key.is_file():
|
||||
key.unlink()
|
||||
if not repo.exists:
|
||||
pytest.skip(f"The repo url '{repo.repo_url}' does not exist")
|
||||
try:
|
||||
yield repo
|
||||
finally:
|
||||
for key in [repo.key_file, repo.key_file.parent / "salt-alt-key.gpg"]:
|
||||
if key.is_file():
|
||||
key.unlink()
|
||||
|
||||
|
||||
def test_adding_repo_file_signedby(pkgrepo, states, repo, subtests):
|
||||
|
|
|
|||
|
|
@ -169,7 +169,10 @@ def docker_container(states):
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def image(tmp_path_factory):
|
||||
def image(grains, tmp_path_factory):
|
||||
if grains["os"] == "VMware Photon OS" and grains["osmajorrelease"] == 5:
|
||||
pytest.skip(f"Temporary skip on {grains['osfinger']}")
|
||||
|
||||
if not salt.utils.path.which("docker"):
|
||||
# Somehow the above skip_if_binaries_missing marker for docker
|
||||
# only get's evaluated after this fixture?!?
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ pytestmark = [
|
|||
pytest.mark.slow_test,
|
||||
pytest.mark.requires_sshd_server,
|
||||
pytest.mark.skipif(
|
||||
"grains['osfinger'] == 'Fedora Linux-39'",
|
||||
reason="Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12",
|
||||
'grains["osfinger"].startswith(("Fedora Linux-40", "Ubuntu-24.04", "Arch Linux"))',
|
||||
reason="System ships with a version of python that is too recent for salt-ssh tests",
|
||||
# Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
|
||||
# and it imports `ssl` and checks if the `match_hostname` function is defined, which
|
||||
# has been deprecated since Python 3.7, so, the logic goes into trying to import
|
||||
|
|
|
|||
|
|
@ -4,10 +4,13 @@ from tests.support.pytest.helpers import reap_stray_processes
|
|||
|
||||
|
||||
@pytest.fixture(scope="package", autouse=True)
|
||||
def _auto_skip_on_fedora_39(grains):
|
||||
if grains["osfinger"] == "Fedora Linux-39":
|
||||
def _auto_skip_on_system_python_too_recent(grains):
|
||||
if (
|
||||
grains["osfinger"] in ("Fedora Linux-40", "Ubuntu-24.04")
|
||||
or grains["os_family"] == "Arch"
|
||||
):
|
||||
pytest.skip(
|
||||
"Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12"
|
||||
"System ships with a version of python that is too recent for salt-ssh tests",
|
||||
# Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
|
||||
# and it imports `ssl` and checks if the `match_hostname` function is defined, which
|
||||
# has been deprecated since Python 3.7, so, the logic goes into trying to import
|
||||
|
|
@ -16,7 +19,7 @@ def _auto_skip_on_fedora_39(grains):
|
|||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def _reap_stray_processes(grains):
|
||||
def _reap_stray_processes():
|
||||
# when tests timeout, we migth leave child processes behind
|
||||
# nuke them
|
||||
with reap_stray_processes():
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@ def test_system_config(grains):
|
|||
"CentOS Stream-8",
|
||||
"CentOS Linux-8",
|
||||
"CentOS Stream-9",
|
||||
"Fedora Linux-36",
|
||||
"VMware Photon OS-3",
|
||||
"Fedora Linux-40",
|
||||
"VMware Photon OS-4",
|
||||
"VMware Photon OS-5",
|
||||
"Amazon Linux-2023",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import pytest
|
|||
|
||||
import salt.modules.kmod as kmod
|
||||
from salt.exceptions import CommandExecutionError
|
||||
from tests.support.mock import MagicMock, patch
|
||||
from tests.support.mock import MagicMock, mock_open, patch
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
|
@ -17,7 +17,7 @@ def test_available():
|
|||
Tests return a list of all available kernel modules
|
||||
"""
|
||||
with patch("salt.modules.kmod.available", MagicMock(return_value=["kvm"])):
|
||||
assert ["kvm"] == kmod.available()
|
||||
assert kmod.available() == ["kvm"]
|
||||
|
||||
|
||||
def test_check_available():
|
||||
|
|
@ -42,7 +42,7 @@ def test_lsmod():
|
|||
), patch.dict(kmod.__salt__, {"cmd.run": mock_cmd}):
|
||||
with pytest.raises(CommandExecutionError):
|
||||
kmod.lsmod()
|
||||
assert expected == kmod.lsmod()
|
||||
assert kmod.lsmod() == expected
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
|
|
@ -55,15 +55,12 @@ def test_mod_list():
|
|||
with patch(
|
||||
"salt.modules.kmod._get_modules_conf",
|
||||
MagicMock(return_value="/etc/modules"),
|
||||
):
|
||||
with patch(
|
||||
"salt.modules.kmod._strip_module_name", MagicMock(return_value="lp")
|
||||
):
|
||||
assert ["lp"] == kmod.mod_list(True)
|
||||
), patch("salt.utils.files.fopen", mock_open(read_data="lp")):
|
||||
assert kmod.mod_list(True) == ["lp"]
|
||||
|
||||
mock_ret = [{"size": 100, "module": None, "depcount": 10, "deps": None}]
|
||||
with patch("salt.modules.kmod.lsmod", MagicMock(return_value=mock_ret)):
|
||||
assert [None] == kmod.mod_list(False)
|
||||
assert kmod.mod_list(False) == [None]
|
||||
|
||||
|
||||
def test_load():
|
||||
|
|
@ -90,10 +87,10 @@ def test_load():
|
|||
kmod.load(mod, True)
|
||||
|
||||
with patch.dict(kmod.__salt__, {"cmd.run_all": mock_run_all_0}):
|
||||
assert [mod] == kmod.load(mod, True)
|
||||
assert kmod.load(mod, True) == [mod]
|
||||
|
||||
with patch.dict(kmod.__salt__, {"cmd.run_all": mock_run_all_1}):
|
||||
assert f"Error loading module {mod}: {err_msg}" == kmod.load(mod)
|
||||
assert kmod.load(mod) == f"Error loading module {mod}: {err_msg}"
|
||||
|
||||
|
||||
def test_is_loaded():
|
||||
|
|
@ -126,11 +123,11 @@ def test_remove():
|
|||
with pytest.raises(CommandExecutionError):
|
||||
kmod.remove(mod)
|
||||
|
||||
assert [mod] == kmod.remove(mod, True)
|
||||
assert kmod.remove(mod, True) == [mod]
|
||||
|
||||
assert [] == kmod.remove(mod)
|
||||
assert kmod.remove(mod) == []
|
||||
|
||||
with patch.dict(kmod.__salt__, {"cmd.run_all": mock_run_all_1}):
|
||||
assert "Error removing module {}: {}".format(
|
||||
mod, err_msg
|
||||
) == kmod.remove(mod, True)
|
||||
assert (
|
||||
kmod.remove(mod, True) == f"Error removing module {mod}: {err_msg}"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -38,11 +38,6 @@ create = command_group(
|
|||
|
||||
_deb_distro_info = {
|
||||
"debian": {
|
||||
"10": {
|
||||
"label": "deb10ary",
|
||||
"codename": "buster",
|
||||
"suitename": "oldoldstable",
|
||||
},
|
||||
"11": {
|
||||
"label": "deb11ary",
|
||||
"codename": "bullseye",
|
||||
|
|
@ -63,9 +58,9 @@ _deb_distro_info = {
|
|||
"label": "salt_ubuntu2204",
|
||||
"codename": "jammy",
|
||||
},
|
||||
"23.04": {
|
||||
"label": "salt_ubuntu2304",
|
||||
"codename": "lunar",
|
||||
"24.04": {
|
||||
"label": "salt_ubuntu2404",
|
||||
"codename": "noble",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -316,8 +311,8 @@ def debian(
|
|||
_rpm_distro_info = {
|
||||
"amazon": ["2", "2023"],
|
||||
"redhat": ["7", "8", "9"],
|
||||
"fedora": ["36", "37", "38", "39"],
|
||||
"photon": ["3", "4", "5"],
|
||||
"fedora": ["40"],
|
||||
"photon": ["4", "5"],
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ TEST_SALT_LISTING = PlatformDefinitions(
|
|||
Linux(slug="debian-11-arm64", display_name="Debian 11 Arm64", arch="arm64"),
|
||||
Linux(slug="debian-12", display_name="Debian 12", arch="x86_64"),
|
||||
Linux(slug="debian-12-arm64", display_name="Debian 12 Arm64", arch="arm64"),
|
||||
Linux(slug="fedora-39", display_name="Fedora 39", arch="x86_64"),
|
||||
Linux(slug="fedora-40", display_name="Fedora 40", arch="x86_64"),
|
||||
Linux(slug="opensuse-15", display_name="Opensuse 15", arch="x86_64"),
|
||||
Linux(slug="photonos-4", display_name="Photon OS 4", arch="x86_64"),
|
||||
Linux(
|
||||
|
|
@ -103,6 +103,12 @@ TEST_SALT_LISTING = PlatformDefinitions(
|
|||
display_name="Ubuntu 22.04 Arm64",
|
||||
arch="arm64",
|
||||
),
|
||||
Linux(slug="ubuntu-24.04", display_name="Ubuntu 24.04", arch="x86_64"),
|
||||
Linux(
|
||||
slug="ubuntu-24.04-arm64",
|
||||
display_name="Ubuntu 24.04 Arm64",
|
||||
arch="arm64",
|
||||
),
|
||||
],
|
||||
"macos": [
|
||||
MacOS(slug="macos-12", display_name="macOS 12", arch="x86_64"),
|
||||
|
|
@ -345,6 +351,18 @@ def generate_workflows(ctx: Context):
|
|||
arch="arm64",
|
||||
pkg_type="deb",
|
||||
),
|
||||
Linux(
|
||||
slug="ubuntu-24.04",
|
||||
display_name="Ubuntu 24.04",
|
||||
arch="x86_64",
|
||||
pkg_type="deb",
|
||||
),
|
||||
Linux(
|
||||
slug="ubuntu-24.04-arm64",
|
||||
display_name="Ubuntu 24.04 Arm64",
|
||||
arch="arm64",
|
||||
pkg_type="deb",
|
||||
),
|
||||
],
|
||||
"macos": [
|
||||
MacOS(slug="macos-12", display_name="macOS 12", arch="x86_64"),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue