mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Merge 3006.x into master
This commit is contained in:
Pedro Algarvio
commit
b85da8d8b0
61 changed files with 606 additions and 180 deletions
41
.github/workflows/ci.yml
vendored
41
.github/workflows/ci.yml
vendored
|
|
@ -701,6 +701,25 @@ jobs:
|
|||
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
photonos-4-arm64-pkg-tests:
|
||||
name: Photon OS 4 Arm64 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-rpm-pkgs
|
||||
uses: ./.github/workflows/test-packages-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: rpm
|
||||
nox-version: 2022.8.7
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
|
||||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2004-pkg-tests:
|
||||
name: Ubuntu 20.04 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -1271,6 +1290,25 @@ jobs:
|
|||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
|
||||
|
||||
photonos-4-arm64:
|
||||
name: Photon OS 4 Arm64
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
nox-version: 2022.8.7
|
||||
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'] }}
|
||||
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
|
||||
|
||||
ubuntu-2004:
|
||||
name: Ubuntu 20.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -1372,6 +1410,7 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
@ -1448,6 +1487,7 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
@ -1461,6 +1501,7 @@ jobs:
|
|||
- debian-11-arm64-pkg-tests
|
||||
- photonos-3-pkg-tests
|
||||
- photonos-4-pkg-tests
|
||||
- photonos-4-arm64-pkg-tests
|
||||
- ubuntu-2004-pkg-tests
|
||||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
|
|
|
|||
41
.github/workflows/nightly.yml
vendored
41
.github/workflows/nightly.yml
vendored
|
|
@ -751,6 +751,25 @@ jobs:
|
|||
skip-junit-reports: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
photonos-4-arm64-pkg-tests:
|
||||
name: Photon OS 4 Arm64 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-rpm-pkgs
|
||||
uses: ./.github/workflows/test-packages-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: rpm
|
||||
nox-version: 2022.8.7
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
|
||||
skip-code-coverage: false
|
||||
skip-junit-reports: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2004-pkg-tests:
|
||||
name: Ubuntu 20.04 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -1321,6 +1340,25 @@ jobs:
|
|||
skip-code-coverage: false
|
||||
skip-junit-reports: false
|
||||
|
||||
photonos-4-arm64:
|
||||
name: Photon OS 4 Arm64
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
nox-version: 2022.8.7
|
||||
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
|
||||
skip-junit-reports: false
|
||||
|
||||
ubuntu-2004:
|
||||
name: Ubuntu 20.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -1422,6 +1460,7 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
@ -2129,6 +2168,7 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
@ -2195,6 +2235,7 @@ jobs:
|
|||
- debian-11-arm64-pkg-tests
|
||||
- photonos-3-pkg-tests
|
||||
- photonos-4-pkg-tests
|
||||
- photonos-4-arm64-pkg-tests
|
||||
- ubuntu-2004-pkg-tests
|
||||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
|
|
|
|||
22
.github/workflows/release.yml
vendored
22
.github/workflows/release.yml
vendored
|
|
@ -664,6 +664,27 @@ jobs:
|
|||
pkg-type: package
|
||||
secrets: inherit
|
||||
|
||||
photonos-4-arm64-package-download-tests:
|
||||
name: Test Photon OS 4 Arm64 package Downloads
|
||||
if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- publish-repositories
|
||||
- download-onedir-artifact
|
||||
uses: ./.github/workflows/test-package-downloads-action-linux.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
environment: release
|
||||
nox-version: 2022.8.7
|
||||
skip-code-coverage: true
|
||||
latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
|
||||
pkg-type: package
|
||||
secrets: inherit
|
||||
|
||||
ubuntu-2004-package-download-tests:
|
||||
name: Test Ubuntu 20.04 package Downloads
|
||||
if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
|
||||
|
|
@ -927,6 +948,7 @@ jobs:
|
|||
- fedora-38-arm64-package-download-tests
|
||||
- photonos-3-package-download-tests
|
||||
- photonos-4-package-download-tests
|
||||
- photonos-4-arm64-package-download-tests
|
||||
- ubuntu-2004-package-download-tests
|
||||
- ubuntu-2004-arm64-package-download-tests
|
||||
- ubuntu-2204-package-download-tests
|
||||
|
|
|
|||
41
.github/workflows/scheduled.yml
vendored
41
.github/workflows/scheduled.yml
vendored
|
|
@ -735,6 +735,25 @@ jobs:
|
|||
skip-junit-reports: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
photonos-4-arm64-pkg-tests:
|
||||
name: Photon OS 4 Arm64 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-rpm-pkgs
|
||||
uses: ./.github/workflows/test-packages-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: rpm
|
||||
nox-version: 2022.8.7
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
|
||||
skip-code-coverage: false
|
||||
skip-junit-reports: false
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2004-pkg-tests:
|
||||
name: Ubuntu 20.04 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -1305,6 +1324,25 @@ jobs:
|
|||
skip-code-coverage: false
|
||||
skip-junit-reports: false
|
||||
|
||||
photonos-4-arm64:
|
||||
name: Photon OS 4 Arm64
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
nox-version: 2022.8.7
|
||||
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
|
||||
skip-junit-reports: false
|
||||
|
||||
ubuntu-2004:
|
||||
name: Ubuntu 20.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -1406,6 +1444,7 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
@ -1484,6 +1523,7 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
@ -1497,6 +1537,7 @@ jobs:
|
|||
- debian-11-arm64-pkg-tests
|
||||
- photonos-3-pkg-tests
|
||||
- photonos-4-pkg-tests
|
||||
- photonos-4-arm64-pkg-tests
|
||||
- ubuntu-2004-pkg-tests
|
||||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
|
|
|
|||
61
.github/workflows/staging.yml
vendored
61
.github/workflows/staging.yml
vendored
|
|
@ -751,6 +751,25 @@ jobs:
|
|||
skip-junit-reports: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
photonos-4-arm64-pkg-tests:
|
||||
name: Photon OS 4 Arm64 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-rpm-pkgs
|
||||
uses: ./.github/workflows/test-packages-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
pkg-type: rpm
|
||||
nox-version: 2022.8.7
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
|
||||
skip-code-coverage: true
|
||||
skip-junit-reports: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
|
||||
ubuntu-2004-pkg-tests:
|
||||
name: Ubuntu 20.04 Package Tests
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -1321,6 +1340,25 @@ jobs:
|
|||
skip-code-coverage: true
|
||||
skip-junit-reports: true
|
||||
|
||||
photonos-4-arm64:
|
||||
name: Photon OS 4 Arm64
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
nox-version: 2022.8.7
|
||||
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
|
||||
skip-junit-reports: true
|
||||
|
||||
ubuntu-2004:
|
||||
name: Ubuntu 20.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -2564,6 +2602,26 @@ jobs:
|
|||
pkg-type: package
|
||||
secrets: inherit
|
||||
|
||||
photonos-4-arm64-package-download-tests:
|
||||
name: Test Photon OS 4 Arm64 package Downloads
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- publish-repositories
|
||||
uses: ./.github/workflows/test-package-downloads-action-linux.yml
|
||||
with:
|
||||
distro-slug: photonos-4-arm64
|
||||
platform: linux
|
||||
arch: aarch64
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
environment: staging
|
||||
nox-version: 2022.8.7
|
||||
skip-code-coverage: true
|
||||
latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
|
||||
pkg-type: package
|
||||
secrets: inherit
|
||||
|
||||
ubuntu-2004-package-download-tests:
|
||||
name: Test Ubuntu 20.04 package Downloads
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
|
@ -2809,6 +2867,7 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- photonos-4-arm64
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
@ -2822,6 +2881,7 @@ jobs:
|
|||
- debian-11-arm64-pkg-tests
|
||||
- photonos-3-pkg-tests
|
||||
- photonos-4-pkg-tests
|
||||
- photonos-4-arm64-pkg-tests
|
||||
- ubuntu-2004-pkg-tests
|
||||
- ubuntu-2004-arm64-pkg-tests
|
||||
- ubuntu-2204-pkg-tests
|
||||
|
|
@ -2854,6 +2914,7 @@ jobs:
|
|||
- fedora-38-arm64-package-download-tests
|
||||
- photonos-3-package-download-tests
|
||||
- photonos-4-package-download-tests
|
||||
- photonos-4-arm64-package-download-tests
|
||||
- ubuntu-2004-package-download-tests
|
||||
- ubuntu-2004-arm64-package-download-tests
|
||||
- ubuntu-2204-package-download-tests
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"),
|
||||
("photonos-3", "Photon OS 3", "x86_64", "package"),
|
||||
("photonos-4", "Photon OS 4", "x86_64", "package"),
|
||||
("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"),
|
||||
("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"),
|
||||
("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"),
|
||||
("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"),
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"),
|
||||
("photonos-3", "Photon OS 3", "x86_64", "rpm"),
|
||||
("photonos-4", "Photon OS 4", "x86_64", "rpm"),
|
||||
("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"),
|
||||
("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"),
|
||||
("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"),
|
||||
("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"),
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@
|
|||
("opensuse-15", "Opensuse 15", "x86_64"),
|
||||
("photonos-3", "Photon OS 3", "x86_64"),
|
||||
("photonos-4", "Photon OS 4", "x86_64"),
|
||||
("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"),
|
||||
("ubuntu-20.04", "Ubuntu 20.04", "x86_64"),
|
||||
("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"),
|
||||
("ubuntu-22.04", "Ubuntu 22.04", "x86_64"),
|
||||
|
|
|
|||
1
changelog/65268.security.md
Normal file
1
changelog/65268.security.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
Bump to `cryptography==41.0.4` due to https://github.com/advisories/GHSA-v8gr-m533-ghj9
|
||||
|
|
@ -1 +1 @@
|
|||
centosstream-9-x86_64: ami-0bd92f4dca5d74017
|
||||
centosstream-9-x86_64: ami-0dfa940714a95b497
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"almalinux-8-arm64": {
|
||||
"ami": "ami-05c1d3dbdeeb94bc6",
|
||||
"ami": "ami-09017a2c26bb6cf37",
|
||||
"ami_description": "CI Image of AlmaLinux 8 arm64",
|
||||
"ami_name": "salt-project/ci/almalinux/8/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/almalinux/8/arm64/20230912.1532",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"almalinux-8": {
|
||||
"ami": "ami-0ec1cbc531f10105b",
|
||||
"ami": "ami-0da7449d7f17dca6d",
|
||||
"ami_description": "CI Image of AlmaLinux 8 x86_64",
|
||||
"ami_name": "salt-project/ci/almalinux/8/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/almalinux/8/x86_64/20230912.1532",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -20,9 +20,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"almalinux-9-arm64": {
|
||||
"ami": "ami-036c495af9dfcf852",
|
||||
"ami": "ami-0b45894ce343176b0",
|
||||
"ami_description": "CI Image of AlmaLinux 9 arm64",
|
||||
"ami_name": "salt-project/ci/almalinux/9/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/almalinux/9/arm64/20230912.1532",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -30,9 +30,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"almalinux-9": {
|
||||
"ami": "ami-0dbc7030666419671",
|
||||
"ami": "ami-0c8a554820c140d45",
|
||||
"ami_description": "CI Image of AlmaLinux 9 x86_64",
|
||||
"ami_name": "salt-project/ci/almalinux/9/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/almalinux/9/x86_64/20230912.1532",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -40,9 +40,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"amazonlinux-2-arm64": {
|
||||
"ami": "ami-022232915c2a5f2d0",
|
||||
"ami": "ami-0aac44852e96fb156",
|
||||
"ami_description": "CI Image of AmazonLinux 2 arm64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20230522.0621",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20230912.1532",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -50,9 +50,29 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"amazonlinux-2": {
|
||||
"ami": "ami-0695f87baa5b5ce15",
|
||||
"ami": "ami-04bf06c280f2957e0",
|
||||
"ami_description": "CI Image of AmazonLinux 2 x86_64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20230522.0620",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20230912.1532",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"amazonlinux-2023.1-arm64": {
|
||||
"ami": "ami-0430562e1dc073734",
|
||||
"ami_description": "CI Image of AmazonLinux 2023.1 arm64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20230912.1532",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"amazonlinux-2023.1": {
|
||||
"ami": "ami-09b7ab6b9bb5ceca3",
|
||||
"ami_description": "CI Image of AmazonLinux 2023.1 x86_64",
|
||||
"ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20230912.1532",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -60,9 +80,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"archlinux-lts": {
|
||||
"ami": "ami-0f6424847f98afc04",
|
||||
"ami": "ami-08ecb254b10e24bca",
|
||||
"ami_description": "CI Image of ArchLinux lts x86_64",
|
||||
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20230912.1532",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -70,9 +90,9 @@
|
|||
"ssh_username": "arch"
|
||||
},
|
||||
"centos-7-arm64": {
|
||||
"ami": "ami-0908831c364e33a37",
|
||||
"ami": "ami-0facb0416e994c2d4",
|
||||
"ami_description": "CI Image of CentOS 7 arm64",
|
||||
"ami_name": "salt-project/ci/centos/7/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/centos/7/arm64/20230912.1553",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -80,9 +100,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"centos-7": {
|
||||
"ami": "ami-0ace33028ada62ddb",
|
||||
"ami": "ami-04e695ebbac38868e",
|
||||
"ami_description": "CI Image of CentOS 7 x86_64",
|
||||
"ami_name": "salt-project/ci/centos/7/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/centos/7/x86_64/20230912.1553",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -90,9 +110,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"centosstream-8-arm64": {
|
||||
"ami": "ami-0b30827dc592b2695",
|
||||
"ami": "ami-02b1e24269822d3fc",
|
||||
"ami_description": "CI Image of CentOSStream 8 arm64",
|
||||
"ami_name": "salt-project/ci/centosstream/8/arm64/20230522.0618",
|
||||
"ami_name": "salt-project/ci/centosstream/8/arm64/20230912.1532",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -100,9 +120,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"centosstream-8": {
|
||||
"ami": "ami-0929882a7e5cfba5f",
|
||||
"ami": "ami-0706ab643607236c0",
|
||||
"ami_description": "CI Image of CentOSStream 8 x86_64",
|
||||
"ami_name": "salt-project/ci/centosstream/8/x86_64/20230522.0618",
|
||||
"ami_name": "salt-project/ci/centosstream/8/x86_64/20230912.1532",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -110,9 +130,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"centosstream-9-arm64": {
|
||||
"ami": "ami-00700fb8821b8b8c7",
|
||||
"ami": "ami-032abe3ace927c296",
|
||||
"ami_description": "CI Image of CentOSStream 9 arm64",
|
||||
"ami_name": "salt-project/ci/centosstream/9/arm64/20230522.0619",
|
||||
"ami_name": "salt-project/ci/centosstream/9/arm64/20230912.1532",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -120,9 +140,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"centosstream-9": {
|
||||
"ami": "ami-0bd92f4dca5d74017",
|
||||
"ami": "ami-091986d83f4c0bdd7",
|
||||
"ami_description": "CI Image of CentOSStream 9 x86_64",
|
||||
"ami_name": "salt-project/ci/centosstream/9/x86_64/20230522.0619",
|
||||
"ami_name": "salt-project/ci/centosstream/9/x86_64/20230912.1532",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -130,9 +150,9 @@
|
|||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"debian-10-arm64": {
|
||||
"ami": "ami-0f681fc9d5de0c3df",
|
||||
"ami": "ami-08b7b9fb74d7c58f2",
|
||||
"ami_description": "CI Image of Debian 10 arm64",
|
||||
"ami_name": "salt-project/ci/debian/10/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/debian/10/arm64/20230912.1546",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -140,9 +160,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-10": {
|
||||
"ami": "ami-0dcf5610590139238",
|
||||
"ami": "ami-0002ea04be195948e",
|
||||
"ami_description": "CI Image of Debian 10 x86_64",
|
||||
"ami_name": "salt-project/ci/debian/10/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/debian/10/x86_64/20230912.1548",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -150,9 +170,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-11-arm64": {
|
||||
"ami": "ami-062b4bf11a864825c",
|
||||
"ami": "ami-0e14ec1b2a5553f96",
|
||||
"ami_description": "CI Image of Debian 11 arm64",
|
||||
"ami_name": "salt-project/ci/debian/11/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/debian/11/arm64/20230912.1548",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -160,9 +180,29 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-11": {
|
||||
"ami": "ami-0f400e5fa6806bbca",
|
||||
"ami": "ami-06c5ea0d19a5773d7",
|
||||
"ami_description": "CI Image of Debian 11 x86_64",
|
||||
"ami_name": "salt-project/ci/debian/11/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/debian/11/x86_64/20230912.1549",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-12-arm64": {
|
||||
"ami": "ami-055b0a6d5bb3e9ecd",
|
||||
"ami_description": "CI Image of Debian 12 arm64",
|
||||
"ami_name": "salt-project/ci/debian/12/arm64/20230912.1550",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-12": {
|
||||
"ami": "ami-0eada119571a913fd",
|
||||
"ami_description": "CI Image of Debian 12 x86_64",
|
||||
"ami_name": "salt-project/ci/debian/12/x86_64/20230912.1550",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -170,9 +210,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"fedora-37-arm64": {
|
||||
"ami": "ami-0d71d6f2b0869842f",
|
||||
"ami": "ami-02b916b21581ead5a",
|
||||
"ami_description": "CI Image of Fedora 37 arm64",
|
||||
"ami_name": "salt-project/ci/fedora/37/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/fedora/37/arm64/20230912.1533",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -180,9 +220,9 @@
|
|||
"ssh_username": "fedora"
|
||||
},
|
||||
"fedora-37": {
|
||||
"ami": "ami-026f494dd4b9d40e8",
|
||||
"ami": "ami-01e0becc3552ad2f6",
|
||||
"ami_description": "CI Image of Fedora 37 x86_64",
|
||||
"ami_name": "salt-project/ci/fedora/37/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/fedora/37/x86_64/20230912.1533",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -190,9 +230,9 @@
|
|||
"ssh_username": "fedora"
|
||||
},
|
||||
"fedora-38-arm64": {
|
||||
"ami": "ami-01ba8a7951daf68fb",
|
||||
"ami": "ami-01f4a3bdee88da9f3",
|
||||
"ami_description": "CI Image of Fedora 38 arm64",
|
||||
"ami_name": "salt-project/ci/fedora/38/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/fedora/38/arm64/20230912.1533",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -200,9 +240,9 @@
|
|||
"ssh_username": "fedora"
|
||||
},
|
||||
"fedora-38": {
|
||||
"ami": "ami-0699dbe70b69e96aa",
|
||||
"ami": "ami-0c38a1907f5b55077",
|
||||
"ami_description": "CI Image of Fedora 38 x86_64",
|
||||
"ami_name": "salt-project/ci/fedora/38/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/fedora/38/x86_64/20230912.1543",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -210,29 +250,69 @@
|
|||
"ssh_username": "fedora"
|
||||
},
|
||||
"opensuse-15": {
|
||||
"ami": "ami-0c594da84f6e1cd96",
|
||||
"ami": "ami-0ecfb817deee506a9",
|
||||
"ami_description": "CI Image of Opensuse 15 x86_64",
|
||||
"ami_name": "salt-project/ci/opensuse/15/x86_64/20230522.0619",
|
||||
"ami_name": "salt-project/ci/opensuse/15/x86_64/20230912.1533",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "ec2-user"
|
||||
},
|
||||
"photonos-3-arm64": {
|
||||
"ami": "ami-0383031c08217b13e",
|
||||
"ami_description": "CI Image of PhotonOS 3 arm64",
|
||||
"ami_name": "salt-project/ci/photonos/3/arm64/20230924.0913",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-3": {
|
||||
"ami": "ami-0db2ebdb9bc3400ef",
|
||||
"ami": "ami-06004a7d856e94355",
|
||||
"ami_description": "CI Image of PhotonOS 3 x86_64",
|
||||
"ami_name": "salt-project/ci/photonos/3/x86_64/20230522.0617",
|
||||
"ami_name": "salt-project/ci/photonos/3/x86_64/20230924.0913",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-4-arm64": {
|
||||
"ami": "ami-08808bcf97f824036",
|
||||
"ami_description": "CI Image of PhotonOS 4 arm64",
|
||||
"ami_name": "salt-project/ci/photonos/4/arm64/20230924.0924",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-4": {
|
||||
"ami": "ami-08a6b6bbf6779a538",
|
||||
"ami": "ami-0fd7a6ed4c61ee312",
|
||||
"ami_description": "CI Image of PhotonOS 4 x86_64",
|
||||
"ami_name": "salt-project/ci/photonos/4/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/photonos/4/x86_64/20230924.0925",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-5-arm64": {
|
||||
"ami": "ami-0c85ad72d107ec4b8",
|
||||
"ami_description": "CI Image of PhotonOS 5 arm64",
|
||||
"ami_name": "salt-project/ci/photonos/5/arm64/20230924.0927",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-5": {
|
||||
"ami": "ami-0732ce03b2ab6fad2",
|
||||
"ami_description": "CI Image of PhotonOS 5 x86_64",
|
||||
"ami_name": "salt-project/ci/photonos/5/x86_64/20230924.0927",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -240,9 +320,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"ubuntu-20.04-arm64": {
|
||||
"ami": "ami-0dccc0de7a38cca90",
|
||||
"ami": "ami-05aeb3d5bf0a16369",
|
||||
"ami_description": "CI Image of Ubuntu 20.04 arm64",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20230912.1551",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -250,9 +330,9 @@
|
|||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-20.04": {
|
||||
"ami": "ami-05e51f893a626b579",
|
||||
"ami": "ami-00cec0054fd71d281",
|
||||
"ami_description": "CI Image of Ubuntu 20.04 x86_64",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20230912.1550",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
@ -260,9 +340,9 @@
|
|||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-22.04-arm64": {
|
||||
"ami": "ami-0c958272da6c09ca6",
|
||||
"ami": "ami-0f7dc3333620d58fd",
|
||||
"ami_description": "CI Image of Ubuntu 22.04 arm64",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20230912.1551",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -270,9 +350,29 @@
|
|||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-22.04": {
|
||||
"ami": "ami-09e45f31ccafcdcec",
|
||||
"ami": "ami-0bc7c1824a6b0752f",
|
||||
"ami_description": "CI Image of Ubuntu 22.04 x86_64",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20230522.0606",
|
||||
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20230912.1552",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-23.04-arm64": {
|
||||
"ami": "ami-0e8818777218efeeb",
|
||||
"ami_description": "CI Image of Ubuntu 23.04 arm64",
|
||||
"ami_name": "salt-project/ci/ubuntu/23.04/arm64/20230912.1552",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
"is_windows": "false",
|
||||
"ssh_username": "ubuntu"
|
||||
},
|
||||
"ubuntu-23.04": {
|
||||
"ami": "ami-0813a38bf6a6cf4de",
|
||||
"ami_description": "CI Image of Ubuntu 23.04 x86_64",
|
||||
"ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20230912.1552",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.large",
|
||||
|
|
|
|||
|
|
@ -1231,7 +1231,7 @@ def decompress_dependencies(session):
|
|||
nox_dependencies_tarball_path = REPO_ROOT / nox_dependencies_tarball
|
||||
if not nox_dependencies_tarball_path.exists():
|
||||
session.error(
|
||||
f"The {nox_dependencies_tarball} file"
|
||||
f"The {nox_dependencies_tarball} file "
|
||||
"does not exist. Not decompressing anything."
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ mock >= 3.0.0
|
|||
# PyTest
|
||||
docker
|
||||
pytest >= 7.2.0
|
||||
pytest-salt-factories >= 1.0.0rc25
|
||||
pytest-salt-factories >= 1.0.0rc26
|
||||
pytest-helpers-namespace >= 2019.1.8
|
||||
pytest-subtests
|
||||
pytest-timeout
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -120,7 +120,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -360,7 +360,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -117,7 +117,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -354,7 +354,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -133,7 +133,7 @@ exceptiongroup==1.1.1
|
|||
# via
|
||||
# anyio
|
||||
# pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -388,7 +388,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cffi==1.15.1
|
|||
# via
|
||||
# clr-loader
|
||||
# cryptography
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
cheroot==10.0.0
|
||||
# via cherrypy
|
||||
|
|
@ -30,7 +30,7 @@ colorama==0.4.6
|
|||
# via pytest
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via -r requirements/crypto.txt
|
||||
distlib==0.3.6
|
||||
# via virtualenv
|
||||
|
|
@ -40,7 +40,7 @@ distro==1.8.0
|
|||
# pytest-skip-markers
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ certifi==2023.07.22
|
|||
# via requests
|
||||
cffi==1.15.1
|
||||
# via cryptography
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
cheroot==10.0.0
|
||||
# via cherrypy
|
||||
|
|
@ -24,7 +24,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/ci/pkgtests.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via -r requirements/crypto.txt
|
||||
distlib==0.3.6
|
||||
# via virtualenv
|
||||
|
|
@ -36,7 +36,7 @@ docker==6.1.3
|
|||
# via -r requirements/static/ci/pkgtests.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ botocore==1.29.152
|
|||
# s3transfer
|
||||
certifi==2023.07.22
|
||||
# via requests
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -117,7 +117,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -315,7 +315,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.11/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/py3.11/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ cffi==1.15.1
|
|||
# napalm
|
||||
# pygit2
|
||||
# pynacl
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# aiohttp
|
||||
|
|
@ -93,7 +93,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -118,7 +118,7 @@ docker==6.1.3
|
|||
# via -r requirements/pytest.txt
|
||||
etcd3-py==0.1.6
|
||||
# via -r requirements/static/ci/common.in
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -115,7 +115,7 @@ docker==6.1.3
|
|||
# via -r requirements/pytest.txt
|
||||
etcd3-py==0.1.6
|
||||
# via -r requirements/static/ci/common.in
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -352,7 +352,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -129,7 +129,7 @@ docker==6.1.3
|
|||
# via -r requirements/pytest.txt
|
||||
etcd3-py==0.1.6
|
||||
# via -r requirements/static/ci/common.in
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -384,7 +384,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cffi==1.15.1
|
|||
# via
|
||||
# clr-loader
|
||||
# cryptography
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
cheroot==10.0.0
|
||||
# via cherrypy
|
||||
|
|
@ -30,7 +30,7 @@ colorama==0.4.6
|
|||
# via pytest
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via -r requirements/crypto.txt
|
||||
distlib==0.3.6
|
||||
# via virtualenv
|
||||
|
|
@ -38,7 +38,7 @@ distro==1.8.0
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# pytest-skip-markers
|
||||
filelock==3.9.0
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ certifi==2023.07.22
|
|||
# via requests
|
||||
cffi==1.15.1
|
||||
# via cryptography
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
cheroot==10.0.0
|
||||
# via cherrypy
|
||||
|
|
@ -24,7 +24,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/ci/pkgtests.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via -r requirements/crypto.txt
|
||||
distlib==0.3.6
|
||||
# via virtualenv
|
||||
|
|
@ -34,7 +34,7 @@ distro==1.8.0
|
|||
# pytest-skip-markers
|
||||
docker==6.1.3
|
||||
# via -r requirements/static/ci/pkgtests.in
|
||||
filelock==3.9.0
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ botocore==1.29.152
|
|||
# s3transfer
|
||||
certifi==2023.07.22
|
||||
# via requests
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -115,7 +115,7 @@ docker==6.1.3
|
|||
# via -r requirements/pytest.txt
|
||||
etcd3-py==0.1.6
|
||||
# via -r requirements/static/ci/common.in
|
||||
filelock==3.12.3
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -313,7 +313,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -117,7 +117,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -133,7 +133,7 @@ exceptiongroup==1.1.1
|
|||
# via
|
||||
# anyio
|
||||
# pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -392,7 +392,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -117,7 +117,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -319,7 +319,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -120,7 +120,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -360,7 +360,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -117,7 +117,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -354,7 +354,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -133,7 +133,7 @@ exceptiongroup==1.1.1
|
|||
# via
|
||||
# anyio
|
||||
# pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -390,7 +390,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ botocore==1.29.152
|
|||
# s3transfer
|
||||
certifi==2023.07.22
|
||||
# via requests
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/crypto.txt
|
||||
|
|
@ -117,7 +117,7 @@ etcd3-py==0.1.6
|
|||
# via -r requirements/static/ci/common.in
|
||||
exceptiongroup==1.1.1
|
||||
# via pytest
|
||||
filelock==3.12.1
|
||||
filelock==3.12.4
|
||||
# via virtualenv
|
||||
flaky==3.7.0
|
||||
# via -r requirements/pytest.txt
|
||||
|
|
@ -315,7 +315,7 @@ pytest-helpers-namespace==2021.12.29
|
|||
# pytest-shell-utilities
|
||||
pytest-httpserver==1.0.8
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-salt-factories==1.0.0rc25
|
||||
pytest-salt-factories==1.0.0rc26
|
||||
# via -r requirements/pytest.txt
|
||||
pytest-shell-utilities==1.8.0
|
||||
# via pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/darwin.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/darwin.txt
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/freebsd.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/freebsd.in
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/linux.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/linux.in
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ clr-loader==0.2.4
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/windows.txt
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ certifi==2023.07.22
|
|||
# via requests
|
||||
cffi==1.15.1
|
||||
# via cryptography
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.2.0
|
||||
# via requests
|
||||
cheroot==10.0.0
|
||||
# via cherrypy
|
||||
|
|
@ -20,7 +20,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/darwin.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/darwin.txt
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/freebsd.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/freebsd.in
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/linux.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/linux.in
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ clr-loader==0.2.4
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/windows.txt
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/freebsd.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/freebsd.in
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/linux.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/linux.in
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ clr-loader==0.2.4
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/windows.txt
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/darwin.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/darwin.txt
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/freebsd.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/freebsd.in
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/static/pkg/linux.in
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/static/pkg/linux.in
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ clr-loader==0.2.4
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.3
|
||||
cryptography==41.0.4
|
||||
# via
|
||||
# -r requirements/crypto.txt
|
||||
# -r requirements/windows.txt
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import time
|
|||
|
||||
import pytest
|
||||
|
||||
from tests.conftest import CODE_DIR
|
||||
|
||||
docker = pytest.importorskip("docker")
|
||||
|
||||
|
||||
|
|
@ -70,10 +72,19 @@ def syndic_network():
|
|||
network.remove()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
@pytest.fixture(scope="module")
|
||||
def source_path():
|
||||
x = pathlib.Path(__file__).parent.parent.parent.parent.parent / "salt"
|
||||
return str(x)
|
||||
return str(CODE_DIR / "salt")
|
||||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def container_image_name():
|
||||
return "ghcr.io/saltstack/salt-ci-containers/salt:3005"
|
||||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def container_python_version():
|
||||
return "3.7"
|
||||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
|
|
@ -187,11 +198,18 @@ external_auth:
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_master(salt_factories, syndic_network, config, source_path):
|
||||
def docker_master(
|
||||
salt_factories,
|
||||
syndic_network,
|
||||
config,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["master_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"master",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
# "entrypoint": "salt-master -ldebug",
|
||||
"entrypoint": "python -m http.server",
|
||||
|
|
@ -199,7 +217,7 @@ def docker_master(salt_factories, syndic_network, config, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
@ -211,18 +229,26 @@ def docker_master(salt_factories, syndic_network, config, source_path):
|
|||
# container.container_start_check(confirm_container_started, container)
|
||||
with container.started() as factory:
|
||||
for user in ("bob", "fnord"):
|
||||
container.run(f"adduser -D {user}")
|
||||
container.run(f"passwd -d {user}")
|
||||
container.run("apk add linux-pam-dev")
|
||||
ret = container.run(f"adduser {user}")
|
||||
assert ret.returncode == 0
|
||||
ret = container.run(f"passwd -d {user}")
|
||||
assert ret.returncode == 0
|
||||
yield factory
|
||||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_minion(salt_factories, syndic_network, config, source_path):
|
||||
def docker_minion(
|
||||
salt_factories,
|
||||
syndic_network,
|
||||
config,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["minion_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"minion",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
# "entrypoint": "salt-minion",
|
||||
"entrypoint": "python -m http.server",
|
||||
|
|
@ -230,7 +256,7 @@ def docker_minion(salt_factories, syndic_network, config, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
@ -245,11 +271,18 @@ def docker_minion(salt_factories, syndic_network, config, source_path):
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_syndic_a(salt_factories, config, syndic_network, source_path):
|
||||
def docker_syndic_a(
|
||||
salt_factories,
|
||||
config,
|
||||
syndic_network,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["syndic_a_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"syndic_a",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
# "entrypoint": "salt-master -ldebug",
|
||||
"entrypoint": "python -m http.server",
|
||||
|
|
@ -257,7 +290,7 @@ def docker_syndic_a(salt_factories, config, syndic_network, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
@ -272,11 +305,18 @@ def docker_syndic_a(salt_factories, config, syndic_network, source_path):
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_syndic_b(salt_factories, config, syndic_network, source_path):
|
||||
def docker_syndic_b(
|
||||
salt_factories,
|
||||
config,
|
||||
syndic_network,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["syndic_b_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"syndic_b",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
# "entrypoint": "salt-master -ldebug",
|
||||
"entrypoint": "python -m http.server",
|
||||
|
|
@ -284,7 +324,7 @@ def docker_syndic_b(salt_factories, config, syndic_network, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
@ -299,11 +339,18 @@ def docker_syndic_b(salt_factories, config, syndic_network, source_path):
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_minion_a1(salt_factories, config, syndic_network, source_path):
|
||||
def docker_minion_a1(
|
||||
salt_factories,
|
||||
config,
|
||||
syndic_network,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["minion_a1_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"minion_a1",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
"network": syndic_network,
|
||||
# "entrypoint": "salt-minion -ldebug",
|
||||
|
|
@ -311,7 +358,7 @@ def docker_minion_a1(salt_factories, config, syndic_network, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
@ -326,11 +373,18 @@ def docker_minion_a1(salt_factories, config, syndic_network, source_path):
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_minion_a2(salt_factories, config, syndic_network, source_path):
|
||||
def docker_minion_a2(
|
||||
salt_factories,
|
||||
config,
|
||||
syndic_network,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["minion_a2_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"minion_a2",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
"network": syndic_network,
|
||||
# "entrypoint": "salt-minion",
|
||||
|
|
@ -338,7 +392,7 @@ def docker_minion_a2(salt_factories, config, syndic_network, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
@ -353,11 +407,18 @@ def docker_minion_a2(salt_factories, config, syndic_network, source_path):
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_minion_b1(salt_factories, config, syndic_network, source_path):
|
||||
def docker_minion_b1(
|
||||
salt_factories,
|
||||
config,
|
||||
syndic_network,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["minion_b1_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"minion_b1",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
"network": syndic_network,
|
||||
# "entrypoint": "salt-minion",
|
||||
|
|
@ -365,7 +426,7 @@ def docker_minion_b1(salt_factories, config, syndic_network, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
@ -380,11 +441,18 @@ def docker_minion_b1(salt_factories, config, syndic_network, source_path):
|
|||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def docker_minion_b2(salt_factories, config, syndic_network, source_path):
|
||||
def docker_minion_b2(
|
||||
salt_factories,
|
||||
config,
|
||||
syndic_network,
|
||||
source_path,
|
||||
container_image_name,
|
||||
container_python_version,
|
||||
):
|
||||
config_dir = str(config["minion_b2_dir"])
|
||||
container = salt_factories.get_container(
|
||||
"minion_b2",
|
||||
image_name="saltstack/salt:3005",
|
||||
image_name=container_image_name,
|
||||
container_run_kwargs={
|
||||
"network": syndic_network,
|
||||
# "entrypoint": "salt-minion",
|
||||
|
|
@ -392,7 +460,7 @@ def docker_minion_b2(salt_factories, config, syndic_network, source_path):
|
|||
"volumes": {
|
||||
config_dir: {"bind": "/etc/salt", "mode": "z"},
|
||||
source_path: {
|
||||
"bind": "/usr/local/lib/python3.7/site-packages/salt/",
|
||||
"bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/",
|
||||
"mode": "z",
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -252,10 +252,15 @@ class TestVirtTest:
|
|||
assert len(caps["guests"]) >= 1
|
||||
assert caps["guests"][0]["os_type"] in ["hvm", "xen", "xenpvh", "exe"]
|
||||
|
||||
def test_cpu_baseline(self, salt_cli, virt_minion_0):
|
||||
def test_cpu_baseline(self, salt_cli, virt_minion_0, grains):
|
||||
"""
|
||||
Test virt.cpu_baseline
|
||||
"""
|
||||
if grains.get("osarch", "") != "x86_64":
|
||||
raise pytest.skip.Exception(
|
||||
f"Test is only meant to run on 'x86_64' architecture, not '{grains['osarch']}'",
|
||||
_use_item_location=True,
|
||||
)
|
||||
vendors = ["Intel", "ARM", "AMD"]
|
||||
ret = salt_cli.run(
|
||||
"virt.cpu_baseline", out="libvirt", minion_tgt=virt_minion_0.id
|
||||
|
|
@ -340,7 +345,12 @@ def virt_domain():
|
|||
|
||||
|
||||
@pytest.fixture
|
||||
def prep_virt(salt_cli, virt_minion_0, virt_minion_1, virt_domain):
|
||||
def prep_virt(salt_cli, virt_minion_0, virt_minion_1, virt_domain, grains):
|
||||
if grains.get("osarch", "") != "x86_64":
|
||||
raise pytest.skip.Exception(
|
||||
f"Test is only meant to run on 'x86_64' architecture, not '{grains['osarch']}'",
|
||||
_use_item_location=True,
|
||||
)
|
||||
try:
|
||||
ret = salt_cli.run("virt.list_domains", minion_tgt=virt_minion_0.id)
|
||||
assert ret.returncode == 0, ret
|
||||
|
|
@ -382,13 +392,18 @@ def prep_virt(salt_cli, virt_minion_0, virt_minion_1, virt_domain):
|
|||
@pytest.mark.slow_test
|
||||
@pytest.mark.skip_if_binaries_missing("docker")
|
||||
class TestVirtMigrateTest:
|
||||
def test_define_xml_path(self, salt_cli, virt_minion_0, virt_domain):
|
||||
def test_define_xml_path(self, salt_cli, virt_minion_0, virt_domain, grains):
|
||||
"""
|
||||
Define a new domain with virt.define_xml_path,
|
||||
verify that the new domain is shown with virt.list_domains,
|
||||
remove the domain with virt.undefine, and verifies that
|
||||
domain is no longer shown with virt.list_domains.
|
||||
"""
|
||||
if grains.get("osarch", "") != "x86_64":
|
||||
raise pytest.skip.Exception(
|
||||
f"Test is only meant to run on 'x86_64' architecture, not '{grains['osarch']}'",
|
||||
_use_item_location=True,
|
||||
)
|
||||
ret = salt_cli.run(
|
||||
"virt.define_xml_path",
|
||||
f"/{virt_domain}.xml",
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@ def network():
|
|||
def host_docker_network_ip_address(network):
|
||||
sminion = create_sminion()
|
||||
network_name = network
|
||||
network_subnet = "10.0.20.0/24"
|
||||
network_gateway = "10.0.20.1"
|
||||
network_subnet = "10.0.21.0/24"
|
||||
network_gateway = "10.0.21.1"
|
||||
try:
|
||||
ret = sminion.states.docker_network.present(
|
||||
network_name,
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ class MySQLCombo:
|
|||
|
||||
def get_test_versions():
|
||||
test_versions = []
|
||||
name = "mysql/mysql-server"
|
||||
name = "mysql-server"
|
||||
for version in ("5.5", "5.6", "5.7", "8.0"):
|
||||
test_versions.append(
|
||||
MySQLImage(
|
||||
|
|
@ -71,7 +71,7 @@ def get_test_versions():
|
|||
)
|
||||
)
|
||||
name = "mariadb"
|
||||
for version in ("10.3", "10.4", "10.5", "10.6"):
|
||||
for version in ("10.3", "10.4", "10.5"):
|
||||
test_versions.append(
|
||||
MySQLImage(
|
||||
name=name,
|
||||
|
|
@ -80,7 +80,7 @@ def get_test_versions():
|
|||
)
|
||||
)
|
||||
name = "percona"
|
||||
for version in ("5.5", "5.6", "5.7", "8.0"):
|
||||
for version in ("5.6", "5.7", "8.0"):
|
||||
test_versions.append(
|
||||
MySQLImage(
|
||||
name=name,
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ class SaltVirtMinionContainerFactory(SaltMinion):
|
|||
self.container_run_kwargs["volumes"].update(
|
||||
{
|
||||
str(CODE_DIR): {"bind": "/salt", "mode": "z"},
|
||||
str(CODE_DIR): {"bind": str(CODE_DIR), "mode": "z"},
|
||||
}
|
||||
)
|
||||
self.container_run_kwargs["working_dir"] = str(CODE_DIR)
|
||||
|
|
|
|||
17
tools/ci.py
17
tools/ci.py
|
|
@ -707,6 +707,7 @@ def pkg_matrix(
|
|||
"ubuntu-22.04-arm64",
|
||||
"photonos-3",
|
||||
"photonos-4",
|
||||
"photonos-4-arm64",
|
||||
]
|
||||
and pkg_type != "MSI"
|
||||
):
|
||||
|
|
@ -717,6 +718,21 @@ def pkg_matrix(
|
|||
# we will have arm64 onedir packages to upgrade from
|
||||
sessions.append("upgrade")
|
||||
sessions.append("downgrade")
|
||||
|
||||
still_testing_3005 = False
|
||||
for release_version in testing_releases:
|
||||
if still_testing_3005:
|
||||
break
|
||||
if release_version < tools.utils.Version("3006.0"):
|
||||
still_testing_3005 = True
|
||||
|
||||
if still_testing_3005 is False:
|
||||
ctx.error(
|
||||
f"No longer testing 3005.x releases please update {__file__} "
|
||||
"and remove this error and the logic above the error"
|
||||
)
|
||||
ctx.exit(1)
|
||||
|
||||
# TODO: Remove this block when we reach version 3009.0, we will no longer be testing upgrades from classic packages
|
||||
if (
|
||||
distro_slug
|
||||
|
|
@ -726,6 +742,7 @@ def pkg_matrix(
|
|||
"ubuntu-22.04-arm64",
|
||||
"photonos-3",
|
||||
"photonos-4",
|
||||
"photonos-4-arm64",
|
||||
]
|
||||
and pkg_type != "MSI"
|
||||
):
|
||||
|
|
|
|||
19
tools/vm.py
19
tools/vm.py
|
|
@ -821,7 +821,12 @@ class VM:
|
|||
|
||||
def write_ssh_config(self):
|
||||
if self.ssh_config_file.exists():
|
||||
return
|
||||
if (
|
||||
f"Hostname {self.instance.private_ip_address}"
|
||||
in self.ssh_config_file.read_text()
|
||||
):
|
||||
# If what's on config matches, then we're good
|
||||
return
|
||||
if os.environ.get("CI") is not None:
|
||||
forward_agent = "no"
|
||||
else:
|
||||
|
|
@ -1128,6 +1133,7 @@ class VM:
|
|||
proc = None
|
||||
checks = 0
|
||||
last_error = None
|
||||
connection_refused_or_reset = False
|
||||
while ssh_connection_timeout_progress <= ssh_connection_timeout:
|
||||
start = time.time()
|
||||
if proc is None:
|
||||
|
|
@ -1167,6 +1173,11 @@ class VM:
|
|||
break
|
||||
proc.wait(timeout=3)
|
||||
stderr = proc.stderr.read().strip()
|
||||
if connection_refused_or_reset is False and (
|
||||
"connection refused" in stderr.lower()
|
||||
or "connection reset" in stderr.lower()
|
||||
):
|
||||
connection_refused_or_reset = True
|
||||
if stderr:
|
||||
stderr = f" Last Error: {stderr}"
|
||||
last_error = stderr
|
||||
|
|
@ -1186,6 +1197,12 @@ class VM:
|
|||
description=f"Waiting for SSH to become available at {host} ...{stderr or ''}",
|
||||
)
|
||||
|
||||
if connection_refused_or_reset:
|
||||
# Since ssh is now running, and we're actually getting a connection
|
||||
# refused error message, let's try to ssh a little slower in order not
|
||||
# to get blocked
|
||||
time.sleep(10)
|
||||
|
||||
if checks >= 10 and proc is not None:
|
||||
proc.kill()
|
||||
proc = None
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue