saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-07 04:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 3006.x into 3007.x

Browse source
This commit is contained in:
Pedro Algarvio 2024-02-29 14:25:24 +00:00
commit b7630f3b08
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
403 changed files with 3058 additions and 3680 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

369
.github/workflows/ci.yml vendored
View file

@ -509,6 +509,90 @@ jobs:
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
almalinux-8-pkg-tests:
name: Alma Linux 8 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: almalinux-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-8-arm64-pkg-tests:
name: Alma Linux 8 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: almalinux-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-pkg-tests:
name: Alma Linux 9 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: almalinux-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-arm64-pkg-tests:
name: Alma Linux 9 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: almalinux-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
amazonlinux-2-pkg-tests:
name: Amazon Linux 2 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -614,69 +698,6 @@ jobs:
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-8-pkg-tests:
name: CentOS Stream 8 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: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-pkg-tests:
name: CentOS Stream 9 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: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-arm64-pkg-tests:
name: CentOS Stream 9 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: centosstream-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-10-pkg-tests:
name: Debian 10 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -782,48 +803,6 @@ jobs:
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-pkg-tests:
name: Photon OS 3 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: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-arm64-pkg-tests:
name: Photon OS 3 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: photonos-3-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-4-pkg-tests:
name: Photon OS 4 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1332,6 +1311,27 @@ jobs:
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-8-arm64:
name: Alma Linux 8 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: almalinux-8-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.13
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 }}
almalinux-9:
name: Alma Linux 9 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1353,6 +1353,27 @@ jobs:
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-9-arm64:
name: Alma Linux 9 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: almalinux-9-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.13
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 }}
amazonlinux-2:
name: Amazon Linux 2 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1479,48 +1500,6 @@ jobs:
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centosstream-8:
name: CentOS Stream 8 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: centosstream-8
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.13
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 }}
centosstream-9:
name: CentOS Stream 9 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: centosstream-9
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.13
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 }}
debian-10:
name: Debian 10 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1626,36 +1605,15 @@ jobs:
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
fedora-37:
name: Fedora 37 Test
fedora-39:
name: Fedora 39 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-37
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.13
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 }}
fedora-38:
name: Fedora 38 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-38
distro-slug: fedora-39
nox-session: ci-test-onedir
platform: linux
arch: x86_64
@ -1689,48 +1647,6 @@ jobs:
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-3:
name: Photon OS 3 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: photonos-3
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.13
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 }}
photonos-3-arm64:
name: Photon OS 3 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: photonos-3-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.13
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 }}
photonos-4:
name: Photon OS 4 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1917,25 +1833,22 @@ jobs:
- macos-13
- macos-13-xlarge
- almalinux-8
- almalinux-8-arm64
- almalinux-9
- almalinux-9-arm64
- amazonlinux-2
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- centosstream-8
- centosstream-9
- debian-10
- debian-11
- debian-11-arm64
- debian-12
- debian-12-arm64
- fedora-37
- fedora-38
- fedora-39
- opensuse-15
- photonos-3
- photonos-3-arm64
- photonos-4
- photonos-4-arm64
- photonos-5
@ -2074,25 +1987,22 @@ jobs:
- macos-13
- macos-13-xlarge
- almalinux-8
- almalinux-8-arm64
- almalinux-9
- almalinux-9-arm64
- amazonlinux-2
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- centosstream-8
- centosstream-9
- debian-10
- debian-11
- debian-11-arm64
- debian-12
- debian-12-arm64
- fedora-37
- fedora-38
- fedora-39
- opensuse-15
- photonos-3
- photonos-3-arm64
- photonos-4
- photonos-4-arm64
- photonos-5
@ -2101,21 +2011,20 @@ jobs:
- ubuntu-2004-arm64
- ubuntu-2204
- ubuntu-2204-arm64
- almalinux-8-pkg-tests
- almalinux-8-arm64-pkg-tests
- almalinux-9-pkg-tests
- almalinux-9-arm64-pkg-tests
- amazonlinux-2-pkg-tests
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- centosstream-8-pkg-tests
- centosstream-9-pkg-tests
- centosstream-9-arm64-pkg-tests
- debian-10-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests
- debian-12-arm64-pkg-tests
- photonos-3-pkg-tests
- photonos-3-arm64-pkg-tests
- photonos-4-pkg-tests
- photonos-4-arm64-pkg-tests
- photonos-5-pkg-tests

2
.github/workflows/lint-action.yml vendored
View file

@ -23,7 +23,7 @@ jobs:
if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }}
container:
image: ghcr.io/saltstack/salt-ci-containers/python:3.8
image: ghcr.io/saltstack/salt-ci-containers/python:3.9
steps:
- name: Install System Deps

399
.github/workflows/nightly.yml vendored
View file

@ -569,6 +569,90 @@ jobs:
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
almalinux-8-pkg-tests:
name: Alma Linux 8 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: almalinux-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-8-arm64-pkg-tests:
name: Alma Linux 8 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: almalinux-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-pkg-tests:
name: Alma Linux 9 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: almalinux-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-arm64-pkg-tests:
name: Alma Linux 9 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: almalinux-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
amazonlinux-2-pkg-tests:
name: Amazon Linux 2 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -674,69 +758,6 @@ jobs:
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-8-pkg-tests:
name: CentOS Stream 8 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: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-pkg-tests:
name: CentOS Stream 9 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: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-arm64-pkg-tests:
name: CentOS Stream 9 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: centosstream-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-10-pkg-tests:
name: Debian 10 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -842,48 +863,6 @@ jobs:
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-pkg-tests:
name: Photon OS 3 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: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-arm64-pkg-tests:
name: Photon OS 3 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: photonos-3-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-4-pkg-tests:
name: Photon OS 4 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1392,6 +1371,27 @@ jobs:
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-8-arm64:
name: Alma Linux 8 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: almalinux-8-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.13
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-9:
name: Alma Linux 9 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1413,6 +1413,27 @@ jobs:
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-9-arm64:
name: Alma Linux 9 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: almalinux-9-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.13
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
amazonlinux-2:
name: Amazon Linux 2 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1539,48 +1560,6 @@ jobs:
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centosstream-8:
name: CentOS Stream 8 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: centosstream-8
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.13
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centosstream-9:
name: CentOS Stream 9 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: centosstream-9
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.13
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
debian-10:
name: Debian 10 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1686,36 +1665,15 @@ jobs:
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
fedora-37:
name: Fedora 37 Test
fedora-39:
name: Fedora 39 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-37
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.13
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
fedora-38:
name: Fedora 38 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-38
distro-slug: fedora-39
nox-session: ci-test-onedir
platform: linux
arch: x86_64
@ -1749,48 +1707,6 @@ jobs:
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-3:
name: Photon OS 3 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: photonos-3
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.13
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-3-arm64:
name: Photon OS 3 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: photonos-3-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.13
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-4:
name: Photon OS 4 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1977,25 +1893,22 @@ jobs:
- macos-13
- macos-13-xlarge
- almalinux-8
- almalinux-8-arm64
- almalinux-9
- almalinux-9-arm64
- amazonlinux-2
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- centosstream-8
- centosstream-9
- debian-10
- debian-11
- debian-11-arm64
- debian-12
- debian-12-arm64
- fedora-37
- fedora-38
- fedora-39
- opensuse-15
- photonos-3
- photonos-3-arm64
- photonos-4
- photonos-4-arm64
- photonos-5
@ -2388,39 +2301,15 @@ jobs:
arch: aarch64
- pkg-type: rpm
distro: fedora
version: "37"
version: "39"
arch: x86_64
- pkg-type: rpm
distro: fedora
version: "37"
version: "39"
arch: arm64
- pkg-type: rpm
distro: fedora
version: "37"
arch: aarch64
- pkg-type: rpm
distro: fedora
version: "38"
arch: x86_64
- pkg-type: rpm
distro: fedora
version: "38"
arch: arm64
- pkg-type: rpm
distro: fedora
version: "38"
arch: aarch64
- pkg-type: rpm
distro: photon
version: "3"
arch: x86_64
- pkg-type: rpm
distro: photon
version: "3"
arch: arm64
- pkg-type: rpm
distro: photon
version: "3"
version: "39"
arch: aarch64
- pkg-type: rpm
distro: photon
@ -2902,25 +2791,22 @@ jobs:
- macos-13
- macos-13-xlarge
- almalinux-8
- almalinux-8-arm64
- almalinux-9
- almalinux-9-arm64
- amazonlinux-2
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- centosstream-8
- centosstream-9
- debian-10
- debian-11
- debian-11-arm64
- debian-12
- debian-12-arm64
- fedora-37
- fedora-38
- fedora-39
- opensuse-15
- photonos-3
- photonos-3-arm64
- photonos-4
- photonos-4-arm64
- photonos-5
@ -2987,21 +2873,20 @@ jobs:
- build-pkgs-src
- combine-all-code-coverage
- publish-repositories
- almalinux-8-pkg-tests
- almalinux-8-arm64-pkg-tests
- almalinux-9-pkg-tests
- almalinux-9-arm64-pkg-tests
- amazonlinux-2-pkg-tests
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- centosstream-8-pkg-tests
- centosstream-9-pkg-tests
- centosstream-9-arm64-pkg-tests
- debian-10-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests
- debian-12-arm64-pkg-tests
- photonos-3-pkg-tests
- photonos-3-arm64-pkg-tests
- photonos-4-pkg-tests
- photonos-4-arm64-pkg-tests
- photonos-5-pkg-tests

3
.github/workflows/release-update-winrepo.yml vendored
View file

@ -41,9 +41,12 @@ jobs:
- name: Add Version to Minion Definition File
working-directory: salt
run: |
pwd
ls -al ../winrepo/salt-minion.sls
python .github/workflows/scripts/update_winrepo.py \
--file ../winrepo/salt-minion.sls \
--version ${{ inputs.salt-version || github.ref_name }}
grep ${{ inputs.salt-version || github.ref_name }} ../winrepo/salt-minion.sls
- name: Commit Changes
working-directory: winrepo

369
.github/workflows/scheduled.yml vendored
View file

@ -551,6 +551,90 @@ jobs:
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
almalinux-8-pkg-tests:
name: Alma Linux 8 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: almalinux-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-8-arm64-pkg-tests:
name: Alma Linux 8 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: almalinux-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-pkg-tests:
name: Alma Linux 9 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: almalinux-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-arm64-pkg-tests:
name: Alma Linux 9 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: almalinux-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
amazonlinux-2-pkg-tests:
name: Amazon Linux 2 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -656,69 +740,6 @@ jobs:
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-8-pkg-tests:
name: CentOS Stream 8 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: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-pkg-tests:
name: CentOS Stream 9 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: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-arm64-pkg-tests:
name: CentOS Stream 9 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: centosstream-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-10-pkg-tests:
name: Debian 10 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -824,48 +845,6 @@ jobs:
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-pkg-tests:
name: Photon OS 3 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: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-arm64-pkg-tests:
name: Photon OS 3 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: photonos-3-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-4-pkg-tests:
name: Photon OS 4 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1374,6 +1353,27 @@ jobs:
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-8-arm64:
name: Alma Linux 8 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: almalinux-8-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.13
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-9:
name: Alma Linux 9 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1395,6 +1395,27 @@ jobs:
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-9-arm64:
name: Alma Linux 9 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: almalinux-9-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.13
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
amazonlinux-2:
name: Amazon Linux 2 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1521,48 +1542,6 @@ jobs:
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centosstream-8:
name: CentOS Stream 8 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: centosstream-8
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.13
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centosstream-9:
name: CentOS Stream 9 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: centosstream-9
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.13
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
debian-10:
name: Debian 10 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1668,36 +1647,15 @@ jobs:
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
fedora-37:
name: Fedora 37 Test
fedora-39:
name: Fedora 39 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-37
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.13
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
fedora-38:
name: Fedora 38 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-38
distro-slug: fedora-39
nox-session: ci-test-onedir
platform: linux
arch: x86_64
@ -1731,48 +1689,6 @@ jobs:
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-3:
name: Photon OS 3 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: photonos-3
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.13
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-3-arm64:
name: Photon OS 3 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: photonos-3-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.13
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-4:
name: Photon OS 4 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1959,25 +1875,22 @@ jobs:
- macos-13
- macos-13-xlarge
- almalinux-8
- almalinux-8-arm64
- almalinux-9
- almalinux-9-arm64
- amazonlinux-2
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- centosstream-8
- centosstream-9
- debian-10
- debian-11
- debian-11-arm64
- debian-12
- debian-12-arm64
- fedora-37
- fedora-38
- fedora-39
- opensuse-15
- photonos-3
- photonos-3-arm64
- photonos-4
- photonos-4-arm64
- photonos-5
@ -2118,25 +2031,22 @@ jobs:
- macos-13
- macos-13-xlarge
- almalinux-8
- almalinux-8-arm64
- almalinux-9
- almalinux-9-arm64
- amazonlinux-2
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- centosstream-8
- centosstream-9
- debian-10
- debian-11
- debian-11-arm64
- debian-12
- debian-12-arm64
- fedora-37
- fedora-38
- fedora-39
- opensuse-15
- photonos-3
- photonos-3-arm64
- photonos-4
- photonos-4-arm64
- photonos-5
@ -2145,21 +2055,20 @@ jobs:
- ubuntu-2004-arm64
- ubuntu-2204
- ubuntu-2204-arm64
- almalinux-8-pkg-tests
- almalinux-8-arm64-pkg-tests
- almalinux-9-pkg-tests
- almalinux-9-arm64-pkg-tests
- amazonlinux-2-pkg-tests
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- centosstream-8-pkg-tests
- centosstream-9-pkg-tests
- centosstream-9-arm64-pkg-tests
- debian-10-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests
- debian-12-arm64-pkg-tests
- photonos-3-pkg-tests
- photonos-3-arm64-pkg-tests
- photonos-4-pkg-tests
- photonos-4-arm64-pkg-tests
- photonos-5-pkg-tests

13
.github/workflows/scripts/update_winrepo.py vendored
View file

@ -1,8 +1,10 @@
import argparse
import os
print("Update winrepo script")
# Where are we
print(os.getcwd())
print(f"Current working directory: {os.getcwd()}")
arg_parser = argparse.ArgumentParser()
arg_parser.add_argument("-f", "--file", help="the winrepo file to edit")
@ -12,10 +14,15 @@ args = arg_parser.parse_args()
file = args.file
version = args.version
print("Args:")
print(f"- file: {file}")
print(f"- version: {version}")
if version.startswith("v"):
version = version[1:]
with open(file) as f:
print(f"Opening file: {file}")
current_contents = f.readlines()
new_contents = []
@ -24,8 +31,12 @@ added = False
for line in current_contents:
new_contents.append(line)
if "load_yaml as versions_relenv" in line and not added:
print(f"Adding version: {version}")
new_contents.append(f"- {version}\n")
added = True
with open(file, "w") as f:
print(f"Writing file: {file}")
f.writelines(new_contents)
print("Update winrepo script complete")

390
.github/workflows/staging.yml vendored
View file

@ -556,6 +556,90 @@ jobs:
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
almalinux-8-pkg-tests:
name: Alma Linux 8 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: almalinux-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-8-arm64-pkg-tests:
name: Alma Linux 8 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: almalinux-8-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-pkg-tests:
name: Alma Linux 9 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: almalinux-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
almalinux-9-arm64-pkg-tests:
name: Alma Linux 9 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: almalinux-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
amazonlinux-2-pkg-tests:
name: Amazon Linux 2 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -661,69 +745,6 @@ jobs:
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-8-pkg-tests:
name: CentOS Stream 8 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: centosstream-8
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-pkg-tests:
name: CentOS Stream 9 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: centosstream-9
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centosstream-9-arm64-pkg-tests:
name: CentOS Stream 9 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: centosstream-9-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-10-pkg-tests:
name: Debian 10 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -829,48 +850,6 @@ jobs:
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-pkg-tests:
name: Photon OS 3 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: photonos-3
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-3-arm64-pkg-tests:
name: Photon OS 3 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: photonos-3-arm64
nox-session: ci-test-onedir
platform: linux
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
photonos-4-pkg-tests:
name: Photon OS 4 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1379,6 +1358,27 @@ jobs:
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-8-arm64:
name: Alma Linux 8 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: almalinux-8-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.13
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-9:
name: Alma Linux 9 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1400,6 +1400,27 @@ jobs:
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
almalinux-9-arm64:
name: Alma Linux 9 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: almalinux-9-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.13
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
amazonlinux-2:
name: Amazon Linux 2 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1526,48 +1547,6 @@ jobs:
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centosstream-8:
name: CentOS Stream 8 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: centosstream-8
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.13
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centosstream-9:
name: CentOS Stream 9 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: centosstream-9
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.13
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
debian-10:
name: Debian 10 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1673,36 +1652,15 @@ jobs:
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
fedora-37:
name: Fedora 37 Test
fedora-39:
name: Fedora 39 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-37
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.13
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
fedora-38:
name: Fedora 38 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-38
distro-slug: fedora-39
nox-session: ci-test-onedir
platform: linux
arch: x86_64
@ -1736,48 +1694,6 @@ jobs:
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-3:
name: Photon OS 3 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: photonos-3
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.13
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-3-arm64:
name: Photon OS 3 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: photonos-3-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.13
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
photonos-4:
name: Photon OS 4 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -2227,39 +2143,15 @@ jobs:
arch: aarch64
- pkg-type: rpm
distro: fedora
version: "37"
version: "39"
arch: x86_64
- pkg-type: rpm
distro: fedora
version: "37"
version: "39"
arch: arm64
- pkg-type: rpm
distro: fedora
version: "37"
arch: aarch64
- pkg-type: rpm
distro: fedora
version: "38"
arch: x86_64
- pkg-type: rpm
distro: fedora
version: "38"
arch: arm64
- pkg-type: rpm
distro: fedora
version: "38"
arch: aarch64
- pkg-type: rpm
distro: photon
version: "3"
arch: x86_64
- pkg-type: rpm
distro: photon
version: "3"
arch: arm64
- pkg-type: rpm
distro: photon
version: "3"
version: "39"
arch: aarch64
- pkg-type: rpm
distro: photon
@ -2875,25 +2767,22 @@ jobs:
- macos-13
- macos-13-xlarge
- almalinux-8
- almalinux-8-arm64
- almalinux-9
- almalinux-9-arm64
- amazonlinux-2
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- centosstream-8
- centosstream-9
- debian-10
- debian-11
- debian-11-arm64
- debian-12
- debian-12-arm64
- fedora-37
- fedora-38
- fedora-39
- opensuse-15
- photonos-3
- photonos-3-arm64
- photonos-4
- photonos-4-arm64
- photonos-5
@ -2902,21 +2791,20 @@ jobs:
- ubuntu-2004-arm64
- ubuntu-2204
- ubuntu-2204-arm64
- almalinux-8-pkg-tests
- almalinux-8-arm64-pkg-tests
- almalinux-9-pkg-tests
- almalinux-9-arm64-pkg-tests
- amazonlinux-2-pkg-tests
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- centosstream-8-pkg-tests
- centosstream-9-pkg-tests
- centosstream-9-arm64-pkg-tests
- debian-10-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests
- debian-12-arm64-pkg-tests
- photonos-3-pkg-tests
- photonos-3-arm64-pkg-tests
- photonos-4-pkg-tests
- photonos-4-arm64-pkg-tests
- photonos-5-pkg-tests

42
.github/workflows/test-package-downloads-action.yml vendored
View file

@ -112,24 +112,6 @@ jobs:
- distro-slug: centos-7-arm64
arch: arm64
pkg-type: package
- distro-slug: centosstream-8
arch: x86_64
pkg-type: package
- distro-slug: centosstream-8-arm64
arch: aarch64
pkg-type: package
- distro-slug: centosstream-8-arm64
arch: arm64
pkg-type: package
- distro-slug: centosstream-9
arch: x86_64
pkg-type: package
- distro-slug: centosstream-9-arm64
arch: aarch64
pkg-type: package
- distro-slug: centosstream-9-arm64
arch: arm64
pkg-type: package
- distro-slug: debian-10
arch: x86_64
pkg-type: package
@ -148,31 +130,13 @@ jobs:
- distro-slug: debian-12-arm64
arch: arm64
pkg-type: package
- distro-slug: fedora-37
- distro-slug: fedora-39
arch: x86_64
pkg-type: package
- distro-slug: fedora-37-arm64
- distro-slug: fedora-39-arm64
arch: aarch64
pkg-type: package
- distro-slug: fedora-37-arm64
arch: arm64
pkg-type: package
- distro-slug: fedora-38
arch: x86_64
pkg-type: package
- distro-slug: fedora-38-arm64
arch: aarch64
pkg-type: package
- distro-slug: fedora-38-arm64
arch: arm64
pkg-type: package
- distro-slug: photonos-3
arch: x86_64
pkg-type: package
- distro-slug: photonos-3-arm64
arch: aarch64
pkg-type: package
- distro-slug: photonos-3-arm64
- distro-slug: fedora-39-arm64
arch: arm64
pkg-type: package
- distro-slug: photonos-4

1
.gitignore vendored
View file

@ -123,6 +123,7 @@ Session.vim
# Nox requirements archives
nox.*.tar.bzip2
nox.*.tar.gz
nox.*.tar.xz
# Debian packages

12
.pre-commit-config.yaml
View file

@ -46,7 +46,7 @@ repos:
)$
- repo: https://github.com/saltstack/python-tools-scripts
rev: "0.18.6"
rev: "0.20.0"
hooks:
- id: tools
alias: check-changelog-entries
@ -1166,6 +1166,7 @@ repos:
# <---- Doc CI Requirements ----------------------------------------------------------------------------------------
# ----- Lint CI Requirements -------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-lint-3.8-requirements
name: Lint CI Py3.8 Requirements
@ -1467,7 +1468,12 @@ repos:
hooks:
- id: blacken-docs
args: [--skip-errors]
files: ^doc/.*\.rst
files: ^(doc/)?.*\.(rst|md)
exclude: >
(?x)^(
rfcs/.*|
salt/ext/.*|
)$
additional_dependencies:
- black==24.2.0
@ -1519,7 +1525,7 @@ repos:
- types-attrs
- types-pyyaml
- types-requests
- python-tools-scripts==0.18.6
- python-tools-scripts==0.20.0
- repo: https://github.com/saltstack/mirrors-nox
rev: v2022.11.21

1004
.pylintrc
View file

File diff suppressed because it is too large Load diff

1
changelog/65859.added.md Normal file
View file

@ -0,0 +1 @@
Add Fedora 39 support

1
changelog/65860.deprecated.md Normal file
View file

@ -0,0 +1 @@
Drop Fedora 37 and Fedora 38 support

1
changelog/66104.deprecated.md Normal file
View file

@ -0,0 +1 @@
Drop CentOS Stream 8 and 9 from CI/CD

1
changelog/66105.deprecated.md Normal file
View file

@ -0,0 +1 @@
Drop Photon OS 3 support

2
changelog/66126.fixed.md Normal file
View file

@ -0,0 +1,2 @@
Fixed a issue with server channel where a minion's public key
would be rejected if it contained a final newline character.

1
changelog/66139.deprecated.md Normal file
View file

@ -0,0 +1 @@
The ``salt.utils.psutil_compat`` module has been deprecated and will be removed in Salt 3008. Please use the ``psutil`` module directly.

5
changelog/66141.security.md Normal file
View file

@ -0,0 +1,5 @@
Upgrade to `cryptography==42.0.5` due to a few security issues:
* https://github.com/advisories/GHSA-9v9h-cgj8-h64p
* https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
* https://github.com/advisories/GHSA-6vqw-3v5j-54x4

1
cicd/amis.yml
View file

@ -1 +0,0 @@
centosstream-9-x86_64: ami-0793e1741f291eaf9

220
cicd/golden-images.json
View file

@ -1,8 +1,8 @@
{
"almalinux-8-arm64": {
"ami": "ami-0a2b327b74836f618",
"ami": "ami-045a65c1d4ceb04a5",
"ami_description": "CI Image of AlmaLinux 8 arm64",
"ami_name": "salt-project/ci/almalinux/8/arm64/20231126.1417",
"ami_name": "salt-project/ci/almalinux/8/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -10,9 +10,9 @@
"ssh_username": "ec2-user"
},
"almalinux-8": {
"ami": "ami-03d4319831692a030",
"ami": "ami-0b9c2b7ba679e691d",
"ami_description": "CI Image of AlmaLinux 8 x86_64",
"ami_name": "salt-project/ci/almalinux/8/x86_64/20231126.1417",
"ami_name": "salt-project/ci/almalinux/8/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -20,9 +20,9 @@
"ssh_username": "ec2-user"
},
"almalinux-9-arm64": {
"ami": "ami-01e0f60c59c6fe8f3",
"ami": "ami-0cbdf762adc955d47",
"ami_description": "CI Image of AlmaLinux 9 arm64",
"ami_name": "salt-project/ci/almalinux/9/arm64/20231126.1417",
"ami_name": "salt-project/ci/almalinux/9/arm64/20240209.1844",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -30,9 +30,9 @@
"ssh_username": "ec2-user"
},
"almalinux-9": {
"ami": "ami-0dbbac81b50ebb8b4",
"ami": "ami-086c8ef0ef6951a8f",
"ami_description": "CI Image of AlmaLinux 9 x86_64",
"ami_name": "salt-project/ci/almalinux/9/x86_64/20231126.1417",
"ami_name": "salt-project/ci/almalinux/9/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -40,9 +40,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2-arm64": {
"ami": "ami-05cc59dcbf59085f1",
"ami": "ami-07bc422e281c67f10",
"ami_description": "CI Image of AmazonLinux 2 arm64",
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20231126.1417",
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -50,9 +50,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2": {
"ami": "ami-07f715092c8ed2451",
"ami": "ami-01ecdeb9a8251824e",
"ami_description": "CI Image of AmazonLinux 2 x86_64",
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231126.1417",
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -60,9 +60,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2023-arm64": {
"ami": "ami-074502af4314eb812",
"ami": "ami-0b8a0efa9ea7ebfa4",
"ami_description": "CI Image of AmazonLinux 2023 arm64",
"ami_name": "salt-project/ci/amazonlinux/2023/arm64/20231126.1417",
"ami_name": "salt-project/ci/amazonlinux/2023/arm64/20240209.1844",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -70,9 +70,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2023": {
"ami": "ami-0a1059334d3373321",
"ami": "ami-0f013d0d9dbaf3b06",
"ami_description": "CI Image of AmazonLinux 2023 x86_64",
"ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20231126.1417",
"ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -80,9 +80,9 @@
"ssh_username": "ec2-user"
},
"archlinux-lts": {
"ami": "ami-0430452d2dfbb8f4b",
"ami": "ami-01f729941d3262787",
"ami_description": "CI Image of ArchLinux lts x86_64",
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20231126.1417",
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "false",
"instance_type": "t3a.large",
@ -90,9 +90,9 @@
"ssh_username": "arch"
},
"centos-7-arm64": {
"ami": "ami-0fc26a930a59d1417",
"ami": "ami-09c1e87fa7a2be337",
"ami_description": "CI Image of CentOS 7 arm64",
"ami_name": "salt-project/ci/centos/7/arm64/20231126.1417",
"ami_name": "salt-project/ci/centos/7/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -100,59 +100,19 @@
"ssh_username": "centos"
},
"centos-7": {
"ami": "ami-0532c2c5f18771fa8",
"ami": "ami-010faf67fdabfbcdf",
"ami_description": "CI Image of CentOS 7 x86_64",
"ami_name": "salt-project/ci/centos/7/x86_64/20231126.1417",
"ami_name": "salt-project/ci/centos/7/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "centos"
},
"centosstream-8-arm64": {
"ami": "ami-0916df690c02e0af0",
"ami_description": "CI Image of CentOSStream 8 arm64",
"ami_name": "salt-project/ci/centosstream/8/arm64/20231126.1417",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
"is_windows": "false",
"ssh_username": "centos"
},
"centosstream-8": {
"ami": "ami-06cf36f0232c681e2",
"ami_description": "CI Image of CentOSStream 8 x86_64",
"ami_name": "salt-project/ci/centosstream/8/x86_64/20231126.1416",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "centos"
},
"centosstream-9-arm64": {
"ami": "ami-094e17e254aa77811",
"ami_description": "CI Image of CentOSStream 9 arm64",
"ami_name": "salt-project/ci/centosstream/9/arm64/20231126.1417",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
"is_windows": "false",
"ssh_username": "ec2-user"
},
"centosstream-9": {
"ami": "ami-0793e1741f291eaf9",
"ami_description": "CI Image of CentOSStream 9 x86_64",
"ami_name": "salt-project/ci/centosstream/9/x86_64/20231126.1417",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "ec2-user"
},
"debian-10-arm64": {
"ami": "ami-0c0b1bdab1b3c9733",
"ami": "ami-018ff5d81815e307f",
"ami_description": "CI Image of Debian 10 arm64",
"ami_name": "salt-project/ci/debian/10/arm64/20231126.1417",
"ami_name": "salt-project/ci/debian/10/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "false",
"instance_type": "m6g.large",
@ -160,9 +120,9 @@
"ssh_username": "admin"
},
"debian-10": {
"ami": "ami-082605fda5afd9131",
"ami": "ami-033f768666c97d386",
"ami_description": "CI Image of Debian 10 x86_64",
"ami_name": "salt-project/ci/debian/10/x86_64/20231126.1417",
"ami_name": "salt-project/ci/debian/10/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -170,9 +130,9 @@
"ssh_username": "admin"
},
"debian-11-arm64": {
"ami": "ami-0df6946d840d24ced",
"ami": "ami-02dfec8b374ad8fc8",
"ami_description": "CI Image of Debian 11 arm64",
"ami_name": "salt-project/ci/debian/11/arm64/20231126.1417",
"ami_name": "salt-project/ci/debian/11/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "false",
"instance_type": "m6g.large",
@ -180,9 +140,9 @@
"ssh_username": "admin"
},
"debian-11": {
"ami": "ami-0c2198080c953861d",
"ami": "ami-06e4f77ed230e2def",
"ami_description": "CI Image of Debian 11 x86_64",
"ami_name": "salt-project/ci/debian/11/x86_64/20231126.1417",
"ami_name": "salt-project/ci/debian/11/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -190,9 +150,9 @@
"ssh_username": "admin"
},
"debian-12-arm64": {
"ami": "ami-050b69eb0e0a66373",
"ami": "ami-05c7771a9ec62dfb2",
"ami_description": "CI Image of Debian 12 arm64",
"ami_name": "salt-project/ci/debian/12/arm64/20231126.1417",
"ami_name": "salt-project/ci/debian/12/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "false",
"instance_type": "m6g.large",
@ -200,49 +160,29 @@
"ssh_username": "admin"
},
"debian-12": {
"ami": "ami-032e397b97865f83e",
"ami": "ami-0ac4b96d4ae5faa23",
"ami_description": "CI Image of Debian 12 x86_64",
"ami_name": "salt-project/ci/debian/12/x86_64/20231126.1417",
"ami_name": "salt-project/ci/debian/12/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "admin"
},
"fedora-37-arm64": {
"ami": "ami-0000739b5d4971ba1",
"ami_description": "CI Image of Fedora 37 arm64",
"ami_name": "salt-project/ci/fedora/37/arm64/20231126.1417",
"fedora-39-arm64": {
"ami": "ami-04f69299edce3ff91",
"ami_description": "CI Image of Fedora 39 arm64",
"ami_name": "salt-project/ci/fedora/39/arm64/20240209.1844",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
"is_windows": "false",
"ssh_username": "fedora"
},
"fedora-37": {
"ami": "ami-086af8fe37696acd6",
"ami_description": "CI Image of Fedora 37 x86_64",
"ami_name": "salt-project/ci/fedora/37/x86_64/20231126.1417",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "fedora"
},
"fedora-38-arm64": {
"ami": "ami-0a078cdd3a57ef342",
"ami_description": "CI Image of Fedora 38 arm64",
"ami_name": "salt-project/ci/fedora/38/arm64/20231126.1417",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
"is_windows": "false",
"ssh_username": "fedora"
},
"fedora-38": {
"ami": "ami-0566e7f93c5cf6afc",
"ami_description": "CI Image of Fedora 38 x86_64",
"ami_name": "salt-project/ci/fedora/38/x86_64/20231126.1417",
"fedora-39": {
"ami": "ami-033bf14cad5d795a2",
"ami_description": "CI Image of Fedora 39 x86_64",
"ami_name": "salt-project/ci/fedora/39/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -250,39 +190,19 @@
"ssh_username": "fedora"
},
"opensuse-15": {
"ami": "ami-0c64c574d488d33f6",
"ami": "ami-023efb1898809e8fe",
"ami_description": "CI Image of Opensuse 15 x86_64",
"ami_name": "salt-project/ci/opensuse/15/x86_64/20231126.1417",
"ami_name": "salt-project/ci/opensuse/15/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "ec2-user"
},
"photonos-3-arm64": {
"ami": "ami-03ac724168ce02eed",
"ami_description": "CI Image of PhotonOS 3 arm64",
"ami_name": "salt-project/ci/photonos/3/arm64/20231126.1417",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
"is_windows": "false",
"ssh_username": "root"
},
"photonos-3": {
"ami": "ami-0072dfd1f7bc5f586",
"ami_description": "CI Image of PhotonOS 3 x86_64",
"ami_name": "salt-project/ci/photonos/3/x86_64/20231126.1417",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "root"
},
"photonos-4-arm64": {
"ami": "ami-05a215fe4cf29227b",
"ami": "ami-0d164263b5095dc45",
"ami_description": "CI Image of PhotonOS 4 arm64",
"ami_name": "salt-project/ci/photonos/4/arm64/20231126.1417",
"ami_name": "salt-project/ci/photonos/4/arm64/20240209.1844",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -290,9 +210,9 @@
"ssh_username": "root"
},
"photonos-4": {
"ami": "ami-06addda42fc8c5db3",
"ami": "ami-0454d6f4e80b94412",
"ami_description": "CI Image of PhotonOS 4 x86_64",
"ami_name": "salt-project/ci/photonos/4/x86_64/20231126.1417",
"ami_name": "salt-project/ci/photonos/4/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -300,9 +220,9 @@
"ssh_username": "root"
},
"photonos-5-arm64": {
"ami": "ami-0e78012df225dbe96",
"ami": "ami-094f4c1e098fc2192",
"ami_description": "CI Image of PhotonOS 5 arm64",
"ami_name": "salt-project/ci/photonos/5/arm64/20231126.1417",
"ami_name": "salt-project/ci/photonos/5/arm64/20240209.1844",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -310,9 +230,9 @@
"ssh_username": "root"
},
"photonos-5": {
"ami": "ami-0fc61f964bc262714",
"ami": "ami-037344b8f3d9e2650",
"ami_description": "CI Image of PhotonOS 5 x86_64",
"ami_name": "salt-project/ci/photonos/5/x86_64/20231126.1417",
"ami_name": "salt-project/ci/photonos/5/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -320,9 +240,9 @@
"ssh_username": "root"
},
"ubuntu-20.04-arm64": {
"ami": "ami-0cc504307b587cd77",
"ami": "ami-0eb0f403664076b82",
"ami_description": "CI Image of Ubuntu 20.04 arm64",
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231126.1417",
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -330,9 +250,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-20.04": {
"ami": "ami-03376fca39f6d9186",
"ami": "ami-07ad57960d22a8b65",
"ami_description": "CI Image of Ubuntu 20.04 x86_64",
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231126.1417",
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -340,9 +260,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-22.04-arm64": {
"ami": "ami-0be361d529bb46410",
"ami": "ami-05197331792cbc895",
"ami_description": "CI Image of Ubuntu 22.04 arm64",
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231126.1417",
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -350,9 +270,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-22.04": {
"ami": "ami-0c9d29f29868da4ce",
"ami": "ami-01d9f296a69eaec3c",
"ami_description": "CI Image of Ubuntu 22.04 x86_64",
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231126.1417",
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -360,9 +280,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-23.04-arm64": {
"ami": "ami-0b80ab7ead3c7d289",
"ami": "ami-0511f6146f198b645",
"ami_description": "CI Image of Ubuntu 23.04 arm64",
"ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231126.1417",
"ami_name": "salt-project/ci/ubuntu/23.04/arm64/20240209.1843",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -370,9 +290,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-23.04": {
"ami": "ami-0d17dce1842e37811",
"ami": "ami-0f09467d281f1a312",
"ami_description": "CI Image of Ubuntu 23.04 x86_64",
"ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231126.1417",
"ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20240209.1843",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -380,9 +300,9 @@
"ssh_username": "ubuntu"
},
"windows-2016": {
"ami": "ami-043db64b3b46a804c",
"ami": "ami-015acc248b175fb3c",
"ami_description": "CI Image of Windows 2016 x86_64",
"ami_name": "salt-project/ci/windows/2016/x86_64/20231126.1417",
"ami_name": "salt-project/ci/windows/2016/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.xlarge",
@ -390,9 +310,9 @@
"ssh_username": "Administrator"
},
"windows-2019": {
"ami": "ami-0f7a8dc8862bff13f",
"ami": "ami-0318f14f8690bf17f",
"ami_description": "CI Image of Windows 2019 x86_64",
"ami_name": "salt-project/ci/windows/2019/x86_64/20231126.1417",
"ami_name": "salt-project/ci/windows/2019/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.xlarge",
@ -400,9 +320,9 @@
"ssh_username": "Administrator"
},
"windows-2022": {
"ami": "ami-05a829f3649aa33d6",
"ami": "ami-0a78a28f614a662ad",
"ami_description": "CI Image of Windows 2022 x86_64",
"ami_name": "salt-project/ci/windows/2022/x86_64/20231126.1417",
"ami_name": "salt-project/ci/windows/2022/x86_64/20240209.1844",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.xlarge",

84
noxfile.py
View file

@ -1308,7 +1308,7 @@ def decompress_dependencies(session):
# Let's try to fix shebang's
try:
fpath = pathlib.Path(path)
contents = fpath.read_text().splitlines()
contents = fpath.read_text(encoding="utf-8").splitlines()
if (
contents[0].startswith("#!")
and contents[0].endswith("python")
@ -1318,7 +1318,9 @@ def decompress_dependencies(session):
"Fixing broken shebang in %r",
str(fpath.relative_to(REPO_ROOT)),
)
fpath.write_text("\n".join([fixed_shebang] + contents[1:]))
fpath.write_text(
"\n".join([fixed_shebang] + contents[1:]), encoding="utf-8"
)
except UnicodeDecodeError:
pass
@ -1475,9 +1477,7 @@ class Tee:
return self._first.fileno()
def _lint(
session, rcfile, flags, paths, tee_output=True, upgrade_setuptools_and_pip=True
):
def _lint(session, rcfile, flags, paths, upgrade_setuptools_and_pip=True):
if _upgrade_pip_setuptools_and_wheel(session, upgrade=upgrade_setuptools_and_pip):
linux_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "linux.txt"
@ -1494,38 +1494,9 @@ def _lint(
]
session.install(*install_command, silent=PIP_INSTALL_SILENT)
if tee_output:
session.run("pylint", "--version")
pylint_report_path = os.environ.get("PYLINT_REPORT")
cmd_args = ["pylint", f"--rcfile={rcfile}"] + list(flags) + list(paths)
cmd_kwargs = {"env": {"PYTHONUNBUFFERED": "1"}}
if tee_output:
stdout = tempfile.TemporaryFile(mode="w+b")
cmd_kwargs["stdout"] = Tee(stdout, sys.__stdout__)
lint_failed = False
try:
session.run(*cmd_args, **cmd_kwargs)
except CommandFailed:
lint_failed = True
raise
finally:
if tee_output:
stdout.seek(0)
contents = stdout.read()
if contents:
contents = contents.decode("utf-8")
sys.stdout.write(contents)
sys.stdout.flush()
if pylint_report_path:
# Write report
with open(pylint_report_path, "w") as wfh:
wfh.write(contents)
session.log("Report file written to %r", pylint_report_path)
stdout.close()
session.run(*cmd_args, **cmd_kwargs)
def _lint_pre_commit(session, rcfile, flags, paths):
@ -1544,26 +1515,17 @@ def _lint_pre_commit(session, rcfile, flags, paths):
from nox.virtualenv import VirtualEnv
# Let's patch nox to make it run inside the pre-commit virtualenv
try:
session._runner.venv = VirtualEnv( # pylint: disable=unexpected-keyword-arg
os.environ["VIRTUAL_ENV"],
interpreter=session._runner.func.python,
reuse_existing=True,
venv=True,
)
except TypeError:
# This is still nox-py2
session._runner.venv = VirtualEnv(
os.environ["VIRTUAL_ENV"],
interpreter=session._runner.func.python,
reuse_existing=True,
)
session._runner.venv = VirtualEnv(
os.environ["VIRTUAL_ENV"],
interpreter=session._runner.func.python,
reuse_existing=True,
venv=True,
)
_lint(
session,
rcfile,
flags,
paths,
tee_output=False,
upgrade_setuptools_and_pip=False,
)
@ -1571,7 +1533,7 @@ def _lint_pre_commit(session, rcfile, flags, paths):
@nox.session(python="3")
def lint(session):
"""
Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output.
Run PyLint against Salt and it's test suite.
"""
session.notify(f"lint-salt-{session.python}")
session.notify(f"lint-tests-{session.python}")
@ -1580,21 +1542,21 @@ def lint(session):
@nox.session(python="3", name="lint-salt")
def lint_salt(session):
"""
Run PyLint against Salt. Set PYLINT_REPORT to a path to capture output.
Run PyLint against Salt.
"""
flags = ["--disable=I"]
if session.posargs:
paths = session.posargs
else:
# TBD replace paths entries when implement pyproject.toml
paths = ["setup.py", "noxfile.py", "salt/"]
paths = ["setup.py", "noxfile.py", "salt/", "tools/"]
_lint(session, ".pylintrc", flags, paths)
@nox.session(python="3", name="lint-tests")
def lint_tests(session):
"""
Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output.
Run PyLint against Salt and it's test suite.
"""
flags = ["--disable=I"]
if session.posargs:
@ -1607,20 +1569,20 @@ def lint_tests(session):
@nox.session(python=False, name="lint-salt-pre-commit")
def lint_salt_pre_commit(session):
"""
Run PyLint against Salt. Set PYLINT_REPORT to a path to capture output.
Run PyLint against Salt.
"""
flags = ["--disable=I"]
if session.posargs:
paths = session.posargs
else:
paths = ["setup.py", "noxfile.py", "salt/"]
paths = ["setup.py", "noxfile.py", "salt/", "tools/"]
_lint_pre_commit(session, ".pylintrc", flags, paths)
@nox.session(python=False, name="lint-tests-pre-commit")
def lint_tests_pre_commit(session):
"""
Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output.
Run PyLint against Salt and it's test suite.
"""
flags = ["--disable=I"]
if session.posargs:
@ -2007,8 +1969,8 @@ def ci_test_onedir_pkgs(session):
+ cmd_args[:]
+ [
"--no-install",
f"--junitxml=artifacts/xml-unittests-output/test-results-install.xml",
f"--log-file=artifacts/logs/runtests-install.log",
"--junitxml=artifacts/xml-unittests-output/test-results-install.xml",
"--log-file=artifacts/logs/runtests-install.log",
]
+ session.posargs
)
@ -2025,8 +1987,8 @@ def ci_test_onedir_pkgs(session):
+ cmd_args[:]
+ [
"--no-install",
f"--junitxml=artifacts/xml-unittests-output/test-results-install-rerun.xml",
f"--log-file=artifacts/logs/runtests-install-rerun.log",
"--junitxml=artifacts/xml-unittests-output/test-results-install-rerun.xml",
"--log-file=artifacts/logs/runtests-install-rerun.log",
"--lf",
]
+ session.posargs

5
requirements/static/ci/lint.in
View file

@ -2,6 +2,7 @@
--constraint=./py{py_version}/{platform}.txt
pylint==2.4.4
SaltPyLint>=2023.3.8
docker
pylint~=3.1.0
SaltPyLint>=2024.2.2
toml

2
requirements/static/ci/py3.10/cloud.txt
View file

@ -20,7 +20,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# requests
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/py3.10/linux.txt
# pyspnego

2
requirements/static/ci/py3.10/darwin.txt
View file

@ -97,7 +97,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.10/freebsd.txt
View file

@ -96,7 +96,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt

65
requirements/static/ci/py3.10/lint.txt
View file

@ -4,31 +4,72 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/lint.txt requirements/static/ci/lint.in
#
astroid==2.3.3
astroid==3.1.0
# via pylint
certifi==2023.07.22
# via
# -c requirements/static/ci/py3.10/linux.txt
# requests
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# requests
dill==0.3.8
# via pylint
docker==6.1.3
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/lint.in
idna==3.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# requests
isort==4.3.21
# via pylint
lazy-object-proxy==1.4.3
# via astroid
mccabe==0.6.1
# via pylint
modernize==0.5
# via saltpylint
pycodestyle==2.10.0
# via saltpylint
pylint==2.4.4
packaging==23.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# pylint
pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
saltpylint==2023.8.3
requests==2.31.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# astroid
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/lint.in
wrapt==1.11.2
# via astroid
tomli==2.0.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# pylint
tomlkit==0.12.3
# via pylint
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# astroid
urllib3==1.26.18
# via
# -c requirements/static/ci/py3.10/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# docker

2
requirements/static/ci/py3.10/linux.txt
View file

@ -109,7 +109,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt

19
requirements/static/ci/py3.10/tools.txt
View file

@ -4,7 +4,9 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/tools.txt requirements/static/ci/tools.in
#
attrs==23.2.0
annotated-types==0.6.0
# via pydantic
attrs==20.3.0
# via
# -r requirements/static/ci/tools.in
# python-tools-scripts
@ -34,11 +36,15 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pygments==2.15.1
pydantic-core==2.16.2
# via pydantic
pydantic==2.6.1
# via python-tools-scripts
pygments==2.13.0
# via rich
python-dateutil==2.8.2
# via botocore
python-tools-scripts==0.18.6
python-tools-scripts==0.20.0
# via -r requirements/static/ci/tools.in
pyyaml==6.0.1
# via -r requirements/static/ci/tools.in
@ -50,8 +56,11 @@ s3transfer==0.6.1
# via boto3
six==1.16.0
# via python-dateutil
typing-extensions==4.2.0
# via python-tools-scripts
typing-extensions==4.9.0
# via
# pydantic
# pydantic-core
# python-tools-scripts
urllib3==1.26.18
# via
# botocore

2
requirements/static/ci/py3.10/windows.txt
View file

@ -93,7 +93,7 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.11/cloud.txt
View file

@ -20,7 +20,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# requests
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# pyspnego

2
requirements/static/ci/py3.11/darwin.txt
View file

@ -96,7 +96,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.11/freebsd.txt
View file

@ -95,7 +95,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt

57
requirements/static/ci/py3.11/lint.txt
View file

@ -4,31 +4,64 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/lint.txt requirements/static/ci/lint.in
#
astroid==2.3.3
astroid==3.1.0
# via pylint
certifi==2023.07.22
# via
# -c requirements/static/ci/py3.11/linux.txt
# requests
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# requests
dill==0.3.8
# via pylint
docker==6.1.3
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/lint.in
idna==3.4
# via
# -c requirements/static/ci/py3.11/linux.txt
# requests
isort==4.3.21
# via pylint
lazy-object-proxy==1.4.3
# via astroid
mccabe==0.6.1
# via pylint
modernize==0.5
# via saltpylint
pycodestyle==2.10.0
# via saltpylint
pylint==2.4.4
packaging==23.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# pylint
pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
saltpylint==2023.8.3
requests==2.31.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# astroid
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/lint.in
wrapt==1.11.2
# via astroid
tomlkit==0.12.3
# via pylint
urllib3==1.26.18
# via
# -c requirements/static/ci/py3.11/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# docker

2
requirements/static/ci/py3.11/linux.txt
View file

@ -108,7 +108,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt

14
requirements/static/ci/py3.11/tools.txt
View file

@ -4,7 +4,9 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/tools.txt requirements/static/ci/tools.in
#
attrs==23.2.0
annotated-types==0.6.0
# via pydantic
attrs==22.1.0
# via
# -r requirements/static/ci/tools.in
# python-tools-scripts
@ -34,11 +36,15 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pydantic-core==2.16.2
# via pydantic
pydantic==2.6.1
# via python-tools-scripts
pygments==2.15.1
# via rich
python-dateutil==2.8.2
# via botocore
python-tools-scripts==0.18.6
python-tools-scripts==0.20.0
# via -r requirements/static/ci/tools.in
pyyaml==6.0.1
# via -r requirements/static/ci/tools.in
@ -50,6 +56,10 @@ s3transfer==0.6.1
# via boto3
six==1.16.0
# via python-dateutil
typing-extensions==4.9.0
# via
# pydantic
# pydantic-core
urllib3==1.26.18
# via
# botocore

2
requirements/static/ci/py3.11/windows.txt
View file

@ -92,7 +92,7 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.12/cloud.txt
View file

@ -129,7 +129,7 @@ croniter==1.3.15 ; sys_platform != "win32"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt

2
requirements/static/ci/py3.12/darwin.txt
View file

@ -96,7 +96,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.12/docs.txt
View file

@ -53,7 +53,7 @@ contextvars==2.4
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.12/freebsd.txt
View file

@ -95,7 +95,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt

30
requirements/static/ci/py3.12/lint.txt
View file

@ -47,7 +47,7 @@ asn1crypto==1.5.1
# -c requirements/static/ci/py3.12/linux.txt
# certvalidator
# oscrypto
astroid==2.3.3
astroid==3.1.0
# via pylint
attrs==23.2.0
# via
@ -147,7 +147,7 @@ croniter==1.3.15 ; sys_platform != "win32"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
@ -158,6 +158,8 @@ cryptography==42.0.3
# paramiko
# pyopenssl
# vcert
dill==0.3.8
# via pylint
distlib==0.3.8
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -172,6 +174,10 @@ dnspython==2.3.0
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/lint.in
etcd3-py==0.1.6
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -325,8 +331,6 @@ kubernetes==3.0.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
lazy-object-proxy==1.4.3
# via astroid
libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -361,8 +365,6 @@ mercurial==6.0.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/linux.in
modernize==0.5
# via saltpylint
more-itertools==5.0.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
@ -423,6 +425,7 @@ packaging==23.1
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# ansible-core
# docker
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -443,6 +446,7 @@ pathspec==0.11.1
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# pylint
# virtualenv
portend==3.1.0
# via
@ -463,8 +467,6 @@ pyasn1==0.5.1
# -c requirements/static/ci/py3.12/linux.txt
# pyasn1-modules
# rsa
pycodestyle==2.10.0
# via saltpylint
pycparser==2.21
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
@ -505,7 +507,7 @@ pyjwt==2.4.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# twilio
pylint==2.4.4
pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
@ -608,6 +610,7 @@ requests==2.31.0
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# apache-libcloud
# docker
# etcd3-py
# kubernetes
# moto
@ -641,7 +644,7 @@ s3transfer==0.6.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# boto3
saltpylint==2023.8.3
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
scp==0.14.5
# via
@ -662,7 +665,6 @@ six==1.16.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# astroid
# cassandra-driver
# etcd3-py
# genshi
@ -728,6 +730,8 @@ toml==0.10.2
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
# -r requirements/static/ci/lint.in
tomlkit==0.12.3
# via pylint
tornado==6.3.3
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
@ -767,6 +771,7 @@ urllib3==1.26.18
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# botocore
# docker
# kubernetes
# python-etcd
# requests
@ -786,6 +791,7 @@ watchdog==3.0.0
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# docker
# kubernetes
wempy==0.2.1
# via
@ -795,8 +801,6 @@ werkzeug==3.0.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# moto
wrapt==1.11.2
# via astroid
xmldiff==2.6.3
# via
# -c requirements/static/ci/py3.12/linux.txt

2
requirements/static/ci/py3.12/linux.txt
View file

@ -108,7 +108,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt

14
requirements/static/ci/py3.12/tools.txt
View file

@ -4,7 +4,9 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.12/tools.txt requirements/static/ci/tools.in
#
attrs==23.2.0
annotated-types==0.6.0
# via pydantic
attrs==22.1.0
# via
# -r requirements/static/ci/tools.in
# python-tools-scripts
@ -34,11 +36,15 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pydantic-core==2.16.2
# via pydantic
pydantic==2.6.1
# via python-tools-scripts
pygments==2.15.1
# via rich
python-dateutil==2.8.2
# via botocore
python-tools-scripts==0.18.6
python-tools-scripts==0.20.0
# via -r requirements/static/ci/tools.in
pyyaml==6.0.1
# via -r requirements/static/ci/tools.in
@ -50,6 +56,10 @@ s3transfer==0.6.1
# via boto3
six==1.16.0
# via python-dateutil
typing-extensions==4.9.0
# via
# pydantic
# pydantic-core
urllib3==1.26.18
# via
# botocore

2
requirements/static/ci/py3.12/windows.txt
View file

@ -92,7 +92,7 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.8/cloud.txt
View file

@ -20,7 +20,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# requests
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/py3.8/linux.txt
# pyspnego

2
requirements/static/ci/py3.8/freebsd.txt
View file

@ -96,7 +96,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt

66
requirements/static/ci/py3.8/lint.txt
View file

@ -4,31 +4,73 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/lint.txt requirements/static/ci/lint.in
#
astroid==2.3.3
astroid==3.1.0
# via pylint
certifi==2023.07.22
# via
# -c requirements/static/ci/py3.8/linux.txt
# requests
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# requests
dill==0.3.8
# via pylint
docker==6.1.3
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/lint.in
idna==3.4
# via
# -c requirements/static/ci/py3.8/linux.txt
# requests
isort==4.3.21
# via pylint
lazy-object-proxy==1.4.3
# via astroid
mccabe==0.6.1
# via pylint
modernize==0.5
# via saltpylint
pycodestyle==2.10.0
# via saltpylint
pylint==2.4.4
packaging==23.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# pylint
pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
saltpylint==2023.8.3
requests==2.31.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# astroid
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/lint.in
wrapt==1.11.2
# via astroid
tomli==2.0.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# pylint
tomlkit==0.12.3
# via pylint
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# astroid
# pylint
urllib3==1.26.18
# via
# -c requirements/static/ci/py3.8/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# docker

2
requirements/static/ci/py3.8/linux.txt
View file

@ -105,7 +105,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.8/windows.txt
View file

@ -93,7 +93,7 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.9/cloud.txt
View file

@ -20,7 +20,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# requests
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/py3.9/linux.txt
# pyspnego

2
requirements/static/ci/py3.9/darwin.txt
View file

@ -97,7 +97,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt

2
requirements/static/ci/py3.9/freebsd.txt
View file

@ -96,7 +96,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt

66
requirements/static/ci/py3.9/lint.txt
View file

@ -4,31 +4,73 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/lint.txt requirements/static/ci/lint.in
#
astroid==2.3.3
astroid==3.1.0
# via pylint
certifi==2023.07.22
# via
# -c requirements/static/ci/py3.9/linux.txt
# requests
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# requests
dill==0.3.8
# via pylint
docker==6.1.3
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/lint.in
idna==3.4
# via
# -c requirements/static/ci/py3.9/linux.txt
# requests
isort==4.3.21
# via pylint
lazy-object-proxy==1.4.3
# via astroid
mccabe==0.6.1
# via pylint
modernize==0.5
# via saltpylint
pycodestyle==2.10.0
# via saltpylint
pylint==2.4.4
packaging==23.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# pylint
pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
saltpylint==2023.8.3
requests==2.31.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# astroid
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/lint.in
wrapt==1.11.2
# via astroid
tomli==2.0.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# pylint
tomlkit==0.12.3
# via pylint
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# astroid
# pylint
urllib3==1.26.18
# via
# -c requirements/static/ci/py3.9/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# docker

2
requirements/static/ci/py3.9/linux.txt
View file

@ -105,7 +105,7 @@ contextvars==2.4
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt

19
requirements/static/ci/py3.9/tools.txt
View file

@ -4,7 +4,9 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/tools.txt requirements/static/ci/tools.in
#
attrs==23.2.0
annotated-types==0.6.0
# via pydantic
attrs==20.3.0
# via
# -r requirements/static/ci/tools.in
# python-tools-scripts
@ -34,11 +36,15 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pygments==2.15.1
pydantic-core==2.16.2
# via pydantic
pydantic==2.6.1
# via python-tools-scripts
pygments==2.13.0
# via rich
python-dateutil==2.8.2
# via botocore
python-tools-scripts==0.18.6
python-tools-scripts==0.20.0
# via -r requirements/static/ci/tools.in
pyyaml==6.0.1
# via -r requirements/static/ci/tools.in
@ -50,8 +56,11 @@ s3transfer==0.6.1
# via boto3
six==1.16.0
# via python-dateutil
typing-extensions==4.2.0
# via python-tools-scripts
typing-extensions==4.9.0
# via
# pydantic
# pydantic-core
# python-tools-scripts
urllib3==1.26.18
# via
# botocore

2
requirements/static/ci/py3.9/windows.txt
View file

@ -93,7 +93,7 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt

2
requirements/static/ci/tools.in
View file

@ -1,5 +1,5 @@
attrs
python-tools-scripts >= 0.18.6
python-tools-scripts >= 0.20.0
boto3
pyyaml
jinja2

2
requirements/static/pkg/py3.10/darwin.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.10/freebsd.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.10/linux.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.10/windows.txt
View file

@ -30,7 +30,7 @@ clr-loader==0.2.6
# via pythonnet
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.11/darwin.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.11/freebsd.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.11/linux.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.11/windows.txt
View file

@ -30,7 +30,7 @@ clr-loader==0.2.6
# via pythonnet
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.12/darwin.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.12/freebsd.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.12/linux.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.12/windows.txt
View file

@ -30,7 +30,7 @@ clr-loader==0.2.6
# via pythonnet
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.8/freebsd.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.8/linux.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.8/windows.txt
View file

@ -30,7 +30,7 @@ clr-loader==0.2.6
# via pythonnet
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.9/darwin.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.9/freebsd.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.9/linux.txt
View file

@ -26,7 +26,7 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

2
requirements/static/pkg/py3.9/windows.txt
View file

@ -30,7 +30,7 @@ clr-loader==0.2.6
# via pythonnet
contextvars==2.4
# via -r requirements/base.txt
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/base.txt
# pyopenssl

1
salt/__init__.py
View file

@ -4,7 +4,6 @@ Salt package
import asyncio
import importlib
import locale
import os
import sys
import warnings

4
salt/_logging/impl.py
View file

@ -170,7 +170,7 @@ class SaltLoggingClass(LOGGING_LOGGER_CLASS, metaclass=LoggingMixinMeta):
logging.getLogger(__name__)
"""
instance = super().__new__(cls)
instance = super().__new__(cls) # pylint: disable=no-value-for-parameter
try:
max_logger_length = len(
@ -480,7 +480,7 @@ def setup_temp_handler(log_level=None):
def tryflush():
try:
handler.flush()
handler.flush() # pylint: disable=cell-var-from-loop
except ValueError:
# File handle has already been closed.
pass

9
salt/auth/pki.py
View file

@ -84,11 +84,10 @@ def auth(username, password, **kwargs):
if cert.verify(cacert.get_pubkey()):
log.info("Successfully authenticated certificate: %s", pem)
return True
else:
log.info("Failed to authenticate certificate: %s", pem)
return False
log.info("Failed to authenticate certificate: %s", pem)
return False
c = OpenSSL.crypto
c = OpenSSL.crypto # pylint: disable=used-before-assignment
cert = c.load_certificate(c.FILETYPE_PEM, pem)
with salt.utils.files.fopen(cacert_file) as f:
@ -101,7 +100,7 @@ def auth(username, password, **kwargs):
cert_asn1 = c.dump_certificate(c.FILETYPE_ASN1, cert)
# Decode the certificate
der = asn1.DerSequence()
der = asn1.DerSequence() # pylint: disable=used-before-assignment
der.decode(cert_asn1)
# The certificate has three parts:

10
salt/beacons/network_info.py
View file

@ -9,13 +9,12 @@ import logging
import salt.utils.beacons
try:
import salt.utils.psutil_compat as psutil
import psutil
HAS_PSUTIL = True
except ImportError:
HAS_PSUTIL = False
log = logging.getLogger(__name__)
__virtualname__ = "network_info"
@ -46,9 +45,10 @@ def _to_list(obj):
def __virtual__():
if not HAS_PSUTIL:
err_msg = "psutil not available"
log.error("Unable to load %s beacon: %s", __virtualname__, err_msg)
return False, err_msg
return (
False,
f"Unable to load {__virtualname__} beacon: psutil library not installed",
)
return __virtualname__

12
salt/beacons/ps.py
View file

@ -7,23 +7,23 @@ import logging
import salt.utils.beacons
try:
import salt.utils.psutil_compat as psutil
import psutil
HAS_PSUTIL = True
except ImportError:
HAS_PSUTIL = False
log = logging.getLogger(__name__) # pylint: disable=invalid-name
log = logging.getLogger(__name__)
__virtualname__ = "ps"
def __virtual__():
if not HAS_PSUTIL:
err_msg = "psutil library is missing."
log.error("Unable to load %s beacon: %s", __virtualname__, err_msg)
return False, err_msg
return (
False,
f"Unable to load {__virtualname__} beacon: psutil library not installed",
)
return __virtualname__

2
salt/channel/client.py
View file

@ -226,7 +226,7 @@ class AsyncReqChannel:
if HAS_M2:
aes = key.private_decrypt(ret["key"], RSA.pkcs1_oaep_padding)
else:
cipher = PKCS1_OAEP.new(key)
cipher = PKCS1_OAEP.new(key) # pylint: disable=used-before-assignment
aes = cipher.decrypt(ret["key"])
# Decrypt using the public key.

2
salt/channel/server.py
View file

@ -621,7 +621,7 @@ class ReqServerChannel:
return {"enc": "clear", "load": {"ret": False}}
if not HAS_M2:
cipher = PKCS1_OAEP.new(pub)
cipher = PKCS1_OAEP.new(pub) # pylint: disable=used-before-assignment
ret = {
"enc": "pub",
"pub_key": self.master_key.get_pub_str(),

5
salt/cli/batch.py
View file

@ -90,7 +90,10 @@ class Batch:
"""
Return the active number of minions to maintain
"""
partition = lambda x: float(x) / 100.0 * len(self.minions)
def partition(x):
return float(x) / 100.0 * len(self.minions)
try:
if isinstance(self.opts["batch"], str) and "%" in self.opts["batch"]:
res = partition(float(self.opts["batch"].strip("%")))

8
salt/cli/cp.py
View file

@ -259,13 +259,7 @@ class SaltCP:
log.debug(
"Creating empty dir %s on %starget '%s'",
dirname,
(
"{} ".format(
selected_target_option
) # pylint: disable=str-format-in-logging
if selected_target_option
else ""
),
f"{selected_target_option} " if selected_target_option else "",
tgt,
)
args = [tgt, "cp.recv_chunked", [remote_path, None], timeout]

2
salt/client/__init__.py
View file

@ -1294,7 +1294,7 @@ class LocalClient:
except KeyError as exc:
# This is a safe pass. We're just using the try/except to
# avoid having to deep-check for keys.
missing_key = exc.__str__().strip("'\"")
missing_key = str(exc).strip("'\"")
if missing_key == "retcode":
log.debug("retcode missing from client return")
else:

24
salt/client/ssh/__init__.py
View file

@ -3,7 +3,6 @@ Create ssh executor system
"""
import base64
import binascii
import copy
import datetime
import getpass
@ -527,7 +526,7 @@ class SSH(MultiprocessingStateMixin):
try:
retcode = int(retcode)
except (TypeError, ValueError):
log.warning(f"Got an invalid retcode for host '{host}': '{retcode}'")
log.warning("Got an invalid retcode for host '%s': '%s'", host, retcode)
retcode = 1
try:
ret = (
@ -549,7 +548,8 @@ class SSH(MultiprocessingStateMixin):
ret.pop("_error", None)
except Exception as err: # pylint: disable=broad-except
log.error(
f"Error while parsing the command output: {err}",
"Error while parsing the command output: %s",
err,
exc_info_on_loglevel=logging.DEBUG,
)
ret = {
@ -589,7 +589,7 @@ class SSH(MultiprocessingStateMixin):
try:
retcode = int(retcode)
except (TypeError, ValueError):
log.warning(f"Got an invalid retcode for host '{host}': '{retcode}'")
log.warning("Got an invalid retcode for host '%s': '%s'", host, retcode)
retcode = 1
ret["ret"] = salt.client.ssh.wrapper.parse_ret(stdout, stderr, retcode)
except (
@ -608,7 +608,8 @@ class SSH(MultiprocessingStateMixin):
ret["ret"].pop("_error", None)
except Exception as err: # pylint: disable=broad-except
log.error(
f"Error while parsing the command output: {err}",
"Error while parsing the command output: %s",
err,
exc_info_on_loglevel=logging.DEBUG,
)
ret["ret"] = {
@ -628,7 +629,7 @@ class SSH(MultiprocessingStateMixin):
"""
que = multiprocessing.Queue()
running = {}
target_iter = self.targets.__iter__()
target_iter = iter(self.targets)
returned = set()
rets = set()
init = False
@ -869,7 +870,7 @@ class SSH(MultiprocessingStateMixin):
for ret, retcode in self.handle_ssh():
host = next(iter(ret))
if not isinstance(retcode, int):
log.warning(f"Host '{host}' returned an invalid retcode: {retcode}")
log.warning("Host '%s' returned an invalid retcode: %s", host, retcode)
retcode = 1
final_exit = max(final_exit, retcode)
@ -880,7 +881,9 @@ class SSH(MultiprocessingStateMixin):
retcode = int(deploy_retcode)
except (TypeError, ValueError):
log.warning(
f"Got an invalid deploy retcode for host '{host}': '{retcode}'"
"Got an invalid deploy retcode for host '%s': '%s'",
host,
retcode,
)
retcode = 1
final_exit = max(final_exit, retcode)
@ -1388,7 +1391,8 @@ class Single:
)
except (TypeError, ValueError):
log.warning(
f"Wrapper module set invalid value for retcode: '{self.context['retcode']}"
"Wrapper module set invalid value for retcode: %s",
self.context["retcode"],
)
retcode = max(retcode, 1)
@ -1860,7 +1864,7 @@ def ssh_version():
["ssh", "-V"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
).communicate()
try:
version_parts = ret[1].split(b",")[0].split(b"_")[1]
version_parts = ret[1].split(b",", maxsplit=1)[0].split(b"_")[1]
parts = []
for part in version_parts:
try:

2
salt/client/ssh/shell.py
View file

@ -342,7 +342,7 @@ class Shell:
pardir = os.path.dirname(remote)
if not pardir:
log.warning(
f"Makedirs called on relative filename: '{remote}'. Skipping."
"Makedirs called on relative filename: '%s'. Skipping.", remote
)
else:
ret = self.exec_cmd("mkdir -p " + shlex.quote(pardir))

11
salt/client/ssh/ssh_py_shim.py
View file

@ -41,7 +41,6 @@ ARGS = None
# The below line is where OPTIONS can be redefined with internal options
# (rather than cli arguments) when the shim is bundled by
# client.ssh.Single._cmd_str()
# pylint: disable=block-comment-should-start-with-cardinal-space
#%%OPTS
@ -230,7 +229,9 @@ def get_executable():
Find executable which matches supported python version in the thin
"""
pymap = {}
with open(os.path.join(OPTIONS.saltdir, "supported-versions")) as _fp:
with open(
os.path.join(OPTIONS.saltdir, "supported-versions"), encoding="utf-8"
) as _fp:
for line in _fp.readlines():
ns, v_maj, v_min = line.strip().split(":")
pymap[ns] = (int(v_maj), int(v_min))
@ -314,7 +315,7 @@ def main(argv): # pylint: disable=W0613
)
)
need_deployment()
with open(code_checksum_path, "r") as vpo:
with open(code_checksum_path, "r", encoding="utf-8") as vpo:
cur_code_cs = vpo.readline().strip()
if cur_code_cs != OPTIONS.code_checksum:
sys.stderr.write(
@ -330,7 +331,7 @@ def main(argv): # pylint: disable=W0613
sys.stderr.write('ERROR: thin is missing "{0}"\n'.format(salt_call_path))
need_deployment()
with open(os.path.join(OPTIONS.saltdir, "minion"), "w") as config:
with open(os.path.join(OPTIONS.saltdir, "minion"), "w", encoding="utf-8") as config:
config.write(OPTIONS.config + "\n")
if OPTIONS.ext_mods:
ext_path = os.path.join(OPTIONS.saltdir, EXT_ARCHIVE)
@ -340,7 +341,7 @@ def main(argv): # pylint: disable=W0613
version_path = os.path.join(OPTIONS.saltdir, "ext_version")
if not os.path.exists(version_path) or not os.path.isfile(version_path):
need_ext()
with open(version_path, "r") as vpo:
with open(version_path, "r", encoding="utf-8") as vpo:
cur_version = vpo.readline().strip()
if cur_version != OPTIONS.ext_mods:
need_ext()

25
salt/client/ssh/wrapper/grains.py
View file

@ -22,21 +22,28 @@ def _serial_sanitizer(instr):
return "{}{}".format(instr[:index], "X" * (length - index))
_FQDN_SANITIZER = lambda x: "MINION.DOMAINNAME"
_HOSTNAME_SANITIZER = lambda x: "MINION"
_DOMAINNAME_SANITIZER = lambda x: "DOMAINNAME"
def _fqdn_sanitizer(x):
return "MINION.DOMAINNAME"
def _hostname_sanitizer(x):
return "MINION"
def _domainname_sanitizer(x):
return "DOMAINNAME"
# A dictionary of grain -> function mappings for sanitizing grain output. This
# is used when the 'sanitize' flag is given.
_SANITIZERS = {
"serialnumber": _serial_sanitizer,
"domain": _DOMAINNAME_SANITIZER,
"fqdn": _FQDN_SANITIZER,
"id": _FQDN_SANITIZER,
"host": _HOSTNAME_SANITIZER,
"localhost": _HOSTNAME_SANITIZER,
"nodename": _HOSTNAME_SANITIZER,
"domain": _domainname_sanitizer,
"fqdn": _fqdn_sanitizer,
"id": _fqdn_sanitizer,
"host": _hostname_sanitizer,
"localhost": _hostname_sanitizer,
"nodename": _hostname_sanitizer,
}

4
salt/client/ssh/wrapper/pillar.py
View file

@ -12,7 +12,9 @@ try:
from collections.abc import Mapping
except ImportError:
# We still allow Py2 import because this could be executed in a machine with Py2.
from collections import Mapping # pylint: disable=no-name-in-module
from collections import ( # pylint: disable=no-name-in-module,deprecated-class
Mapping,
)
def get(key, default="", merge=False, delimiter=DEFAULT_TARGET_DELIM):

2
salt/cloud/cli.py
View file

@ -390,12 +390,10 @@ class SaltCloud(salt.utils.parsers.SaltCloudParser):
self.error(msg.format(exc))
# This is a generic exception, log it, include traceback if
# debug logging is enabled and exit.
# pylint: disable=str-format-in-logging
log.error(
msg.format(exc),
# Show the traceback if the debug logging level is
# enabled
exc_info_on_loglevel=logging.DEBUG,
)
# pylint: enable=str-format-in-logging
self.exit(salt.defaults.exitcodes.EX_GENERIC)

2
salt/cloud/clouds/aliyun.py
View file

@ -794,7 +794,7 @@ def query(params=None):
signature = _compute_signature(parameters, access_key_secret)
parameters["Signature"] = signature
request = requests.get(path, params=parameters, verify=True)
request = requests.get(path, params=parameters, verify=True, timeout=120)
if request.status_code != 200:
raise SaltCloudSystemExit(
"An error occurred while querying aliyun ECS. HTTP Code: {} "

2
salt/cloud/clouds/clc.py
View file

@ -308,7 +308,7 @@ def get_build_status(req_id, nodename):
counter = 0
req_id = str(req_id)
while counter < 10:
queue = clc.v1.Blueprint.GetStatus(request_id=(req_id))
queue = clc.v1.Blueprint.GetStatus(request_id=req_id)
if queue["PercentComplete"] == 100:
server_name = queue["Servers"][0]
creds = get_creds()

12
salt/cloud/clouds/digitalocean.py
View file

@ -483,9 +483,14 @@ def create(vm_):
dns_hostname,
dns_domain,
)
__add_dns_addr__ = lambda t, d: post_dns_record(
dns_domain=dns_domain, name=dns_hostname, record_type=t, record_data=d
)
def __add_dns_addr__(t, d):
return post_dns_record(
dns_domain=dns_domain,
name=dns_hostname,
record_type=t,
record_data=d,
)
log.debug("create_dns_record: %s", __add_dns_addr__)
else:
@ -651,6 +656,7 @@ def query(
"Authorization": "Bearer " + personal_access_token,
"Content-Type": "application/json",
},
timeout=120,
)
if request.status_code > 299:
raise SaltCloudSystemExit(

9
salt/cloud/clouds/ec2.py
View file

@ -401,7 +401,7 @@ def query(
log.trace("EC2 Request Parameters: %s", params_with_headers)
try:
result = requests.get(
requesturl, headers=headers, params=params_with_headers
requesturl, headers=headers, params=params_with_headers, timeout=120
)
log.debug(
"EC2 Response Status Code: %s",
@ -1195,10 +1195,11 @@ def get_imageid(vm_):
"Filter.0.Name": "name",
"Filter.0.Value.0": image,
}
# Query AWS, sort by 'creationDate' and get the last imageId
_t = lambda x: datetime.datetime.strptime(
x["creationDate"], "%Y-%m-%dT%H:%M:%S.%fZ"
)
def _t(x):
return datetime.datetime.strptime(x["creationDate"], "%Y-%m-%dT%H:%M:%S.%fZ")
image_id = sorted(
aws.query(
params,

4
salt/cloud/clouds/joyent.py
View file

@ -1163,8 +1163,8 @@ def query(action=None, command=None, args=None, method="GET", location=None, dat
digest = md.final()
signed = rsa_key.sign(digest, algo="sha256")
else:
rsa_ = PKCS1_v1_5.new(rsa_key)
hash_ = SHA256.new()
rsa_ = PKCS1_v1_5.new(rsa_key) # pylint: disable=used-before-assignment
hash_ = SHA256.new() # pylint: disable=used-before-assignment
hash_.update(timestamp.encode(__salt_system_encoding__))
signed = rsa_.sign(hash_)
signed = base64.b64encode(signed)

8
salt/cloud/clouds/linode.py
View file

@ -452,7 +452,9 @@ class LinodeAPIv4(LinodeAPI):
attempt = 0
while True:
try:
result = requests.request(method, url, json=data, headers=headers)
result = requests.request(
method, url, json=data, headers=headers, timeout=120
)
log.debug("Linode API response status code: %d", result.status_code)
log.trace("Linode API response body: %s", result.text)
@ -1018,7 +1020,9 @@ class LinodeAPIv4(LinodeAPI):
"entity.type": entity,
}
last_event = None
condition = lambda event: self._check_event_status(event, status)
def condition(event):
return self._check_event_status(event, status)
while True:
if last_event is not None:

13
salt/cloud/clouds/proxmox.py
View file

@ -148,7 +148,9 @@ def _authenticate():
connect_data = {"username": username, "password": passwd}
full_url = f"https://{url}:{port}/api2/json/access/ticket"
response = requests.post(full_url, verify=verify_ssl, data=connect_data)
response = requests.post(
full_url, verify=verify_ssl, data=connect_data, timeout=120
)
response.raise_for_status()
returned_data = response.json()
@ -182,6 +184,7 @@ def query(conn_type, option, post_data=None):
data=post_data,
cookies=ticket,
headers=httpheaders,
timeout=120,
)
elif conn_type == "put":
httpheaders["CSRFPreventionToken"] = csrf
@ -191,6 +194,7 @@ def query(conn_type, option, post_data=None):
data=post_data,
cookies=ticket,
headers=httpheaders,
timeout=120,
)
elif conn_type == "delete":
httpheaders["CSRFPreventionToken"] = csrf
@ -200,9 +204,12 @@ def query(conn_type, option, post_data=None):
data=post_data,
cookies=ticket,
headers=httpheaders,
timeout=120,
)
elif conn_type == "get":
response = requests.get(full_url, verify=verify_ssl, cookies=ticket)
response = requests.get(
full_url, verify=verify_ssl, cookies=ticket, timeout=120
)
try:
response.raise_for_status()
@ -871,7 +878,7 @@ def _import_api():
"""
global api
full_url = f"https://{url}:{port}/pve-docs/api-viewer/apidoc.js"
returned_data = requests.get(full_url, verify=verify_ssl)
returned_data = requests.get(full_url, verify=verify_ssl, timeout=120)
re_filter = re.compile(" (?:pveapi|apiSchema) = (.*)^;", re.DOTALL | re.MULTILINE)
api_json = re_filter.findall(returned_data.text)[0]

4
salt/cloud/clouds/qingcloud.py
View file

@ -179,7 +179,7 @@ def query(params=None):
# print('parameters:')
# pprint.pprint(real_parameters)
request = requests.get(path, params=real_parameters, verify=verify_ssl)
request = requests.get(path, params=real_parameters, verify=verify_ssl, timeout=120)
# print('url:')
# print(request.url)
@ -437,7 +437,7 @@ def _get_size(vm_):
if not vm_size:
raise SaltCloudNotFound("No size specified for this instance.")
if vm_size in sizes.keys():
if vm_size in sizes:
return vm_size
raise SaltCloudNotFound(f"The specified size, '{vm_size}', could not be found.")

Some files were not shown because too many files have changed in this diff Show more