diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b6de9cff239..4e88f05b4a24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1527,27 +1527,6 @@ jobs: workflow-slug: ci default-timeout: 180 - archlinux-lts: - name: Arch Linux LTS 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: archlinux-lts - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - gh-actions-python-version: "3.10" - testrun: ${{ needs.prepare-workflow.outputs.testrun }} - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14 - skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} - workflow-slug: ci - default-timeout: 180 - debian-11: name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11') }} @@ -1995,7 +1974,6 @@ jobs: - amazonlinux-2-arm64 - amazonlinux-2023 - amazonlinux-2023-arm64 - - archlinux-lts - debian-11 - debian-11-arm64 - debian-12 @@ -2163,7 +2141,6 @@ jobs: - amazonlinux-2-arm64 - amazonlinux-2023 - amazonlinux-2023-arm64 - - archlinux-lts - debian-11 - debian-11-arm64 - debian-12 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 18e390d8ab7f..d7bb49730019 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1589,27 +1589,6 @@ jobs: workflow-slug: nightly default-timeout: 360 - archlinux-lts: - name: Arch Linux LTS 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: archlinux-lts - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - gh-actions-python-version: "3.10" - testrun: ${{ needs.prepare-workflow.outputs.testrun }} - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14 - skip-code-coverage: false - workflow-slug: nightly - default-timeout: 360 - debian-11: name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2057,7 +2036,6 @@ jobs: - amazonlinux-2-arm64 - amazonlinux-2023 - amazonlinux-2023-arm64 - - archlinux-lts - debian-11 - debian-11-arm64 - debian-12 @@ -2964,7 +2942,6 @@ jobs: - amazonlinux-2-arm64 - amazonlinux-2023 - amazonlinux-2023-arm64 - - archlinux-lts - debian-11 - debian-11-arm64 - debian-12 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 767b8c17f46d..86e57fb71a42 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1566,27 +1566,6 @@ jobs: workflow-slug: scheduled default-timeout: 360 - archlinux-lts: - name: Arch Linux LTS 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: archlinux-lts - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - gh-actions-python-version: "3.10" - testrun: ${{ needs.prepare-workflow.outputs.testrun }} - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14 - skip-code-coverage: false - workflow-slug: scheduled - default-timeout: 360 - debian-11: name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2034,7 +2013,6 @@ jobs: - amazonlinux-2-arm64 - amazonlinux-2023 - amazonlinux-2023-arm64 - - archlinux-lts - debian-11 - debian-11-arm64 - debian-12 @@ -2204,7 +2182,6 @@ jobs: - amazonlinux-2-arm64 - amazonlinux-2023 - amazonlinux-2023-arm64 - - archlinux-lts - debian-11 - debian-11-arm64 - debian-12 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 2cf7786fe2c8..1c2546357e01 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1574,27 +1574,6 @@ jobs: workflow-slug: staging default-timeout: 180 - archlinux-lts: - name: Arch Linux LTS 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: archlinux-lts - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - gh-actions-python-version: "3.10" - testrun: ${{ needs.prepare-workflow.outputs.testrun }} - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14 - skip-code-coverage: true - workflow-slug: staging - default-timeout: 180 - debian-11: name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2917,7 +2896,6 @@ jobs: - amazonlinux-2-arm64 - amazonlinux-2023 - amazonlinux-2023-arm64 - - archlinux-lts - debian-11 - debian-11-arm64 - debian-12 diff --git a/.gitignore b/.gitignore index 63b49a644872..73cc51c3d1ce 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,7 @@ tests/unit/templates/roots # Pycharm .idea venv/ +.venv/ # VS Code .vscode diff --git a/changelog/66886.deprecated.md b/changelog/66886.deprecated.md new file mode 100644 index 000000000000..597c0aee10a4 --- /dev/null +++ b/changelog/66886.deprecated.md @@ -0,0 +1 @@ +Drop Arch Linux support diff --git a/cicd/golden-images.json b/cicd/golden-images.json index ca7818fdd6ba..b0504ad777a7 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -1,8 +1,8 @@ { "amazonlinux-2-arm64": { - "ami": "ami-0c98c023fba59d522", + "ami": "ami-0aab00f54b6cddde6", "ami_description": "CI Image of AmazonLinux 2 arm64", - "ami_name": "salt-project/ci/amazonlinux/2/arm64/20240509.1530", + "ami_name": "salt-project/ci/amazonlinux/2/arm64/20240912.2135", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -10,9 +10,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2": { - "ami": "ami-02cba95cfd7074794", + "ami": "ami-0fd6cec7bbcf52d36", "ami_description": "CI Image of AmazonLinux 2 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20240509.1530", + "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20240912.2135", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -20,9 +20,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023-arm64": { - "ami": "ami-0609f0e98f5a6b73d", + "ami": "ami-095e9e4757b5fca1a", "ami_description": "CI Image of AmazonLinux 2023 arm64", - "ami_name": "salt-project/ci/amazonlinux/2023/arm64/20240509.1529", + "ami_name": "salt-project/ci/amazonlinux/2023/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -30,29 +30,19 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023": { - "ami": "ami-0554a801eb6dcc42c", + "ami": "ami-002d043f1a36bf06e", "ami_description": "CI Image of AmazonLinux 2023 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20240509.1529", + "ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", "is_windows": "false", "ssh_username": "ec2-user" }, - "archlinux-lts": { - "ami": "ami-01ad78f19930b9747", - "ami_description": "CI Image of ArchLinux lts x86_64", - "ami_name": "salt-project/ci/archlinux/lts/x86_64/20240509.1530", - "arch": "x86_64", - "cloudwatch-agent-available": "false", - "instance_type": "t3a.large", - "is_windows": "false", - "ssh_username": "arch" - }, "debian-11-arm64": { - "ami": "ami-0eff227d9a94d8692", + "ami": "ami-0ff63235fce7bea1d", "ami_description": "CI Image of Debian 11 arm64", - "ami_name": "salt-project/ci/debian/11/arm64/20240509.1529", + "ami_name": "salt-project/ci/debian/11/arm64/20240912.2135", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -60,9 +50,9 @@ "ssh_username": "admin" }, "debian-11": { - "ami": "ami-099b2a5a1fb995166", + "ami": "ami-08685bfca48beeb67", "ami_description": "CI Image of Debian 11 x86_64", - "ami_name": "salt-project/ci/debian/11/x86_64/20240509.1529", + "ami_name": "salt-project/ci/debian/11/x86_64/20240912.2135", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -70,9 +60,9 @@ "ssh_username": "admin" }, "debian-12-arm64": { - "ami": "ami-0ab6b0cc8488f8880", + "ami": "ami-07d383138f04b32ba", "ami_description": "CI Image of Debian 12 arm64", - "ami_name": "salt-project/ci/debian/12/arm64/20240509.1529", + "ami_name": "salt-project/ci/debian/12/arm64/20240912.2135", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -80,9 +70,9 @@ "ssh_username": "admin" }, "debian-12": { - "ami": "ami-0e1f5b55325249c4e", + "ami": "ami-0867ec74072fd97a0", "ami_description": "CI Image of Debian 12 x86_64", - "ami_name": "salt-project/ci/debian/12/x86_64/20240509.1530", + "ami_name": "salt-project/ci/debian/12/x86_64/20240912.2135", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -90,9 +80,9 @@ "ssh_username": "admin" }, "fedora-40-arm64": { - "ami": "ami-064df327a55f83953", + "ami": "ami-03be8e03c17f1abeb", "ami_description": "CI Image of Fedora 40 arm64", - "ami_name": "salt-project/ci/fedora/40/arm64/20240509.1530", + "ami_name": "salt-project/ci/fedora/40/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -100,9 +90,9 @@ "ssh_username": "fedora" }, "fedora-40": { - "ami": "ami-08d8dbd4f063788de", + "ami": "ami-060a59b30809758b2", "ami_description": "CI Image of Fedora 40 x86_64", - "ami_name": "salt-project/ci/fedora/40/x86_64/20240509.1530", + "ami_name": "salt-project/ci/fedora/40/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -110,9 +100,9 @@ "ssh_username": "fedora" }, "opensuse-15": { - "ami": "ami-0f82d5ab3015af6ad", + "ami": "ami-0aaf63315ada5365b", "ami_description": "CI Image of Opensuse 15 x86_64", - "ami_name": "salt-project/ci/opensuse/15/x86_64/20240509.1529", + "ami_name": "salt-project/ci/opensuse/15/x86_64/20240912.2135", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -120,9 +110,9 @@ "ssh_username": "ec2-user" }, "photonos-4-arm64": { - "ami": "ami-0ea152c346cb8e13b", + "ami": "ami-0d425acec9d0d78a5", "ami_description": "CI Image of PhotonOS 4 arm64", - "ami_name": "salt-project/ci/photonos/4/arm64/20240509.1530", + "ami_name": "salt-project/ci/photonos/4/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -130,9 +120,9 @@ "ssh_username": "root" }, "photonos-4": { - "ami": "ami-09b55d0bf3a1aa7e5", + "ami": "ami-056d988807f8b586d", "ami_description": "CI Image of PhotonOS 4 x86_64", - "ami_name": "salt-project/ci/photonos/4/x86_64/20240509.1530", + "ami_name": "salt-project/ci/photonos/4/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -140,9 +130,9 @@ "ssh_username": "root" }, "photonos-5-arm64": { - "ami": "ami-09de4952bc9fc068a", + "ami": "ami-059f47b459d04544a", "ami_description": "CI Image of PhotonOS 5 arm64", - "ami_name": "salt-project/ci/photonos/5/arm64/20240509.1530", + "ami_name": "salt-project/ci/photonos/5/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -150,9 +140,9 @@ "ssh_username": "root" }, "photonos-5": { - "ami": "ami-0c3375a583643fc77", + "ami": "ami-06424daf7c85ffff0", "ami_description": "CI Image of PhotonOS 5 x86_64", - "ami_name": "salt-project/ci/photonos/5/x86_64/20240509.1530", + "ami_name": "salt-project/ci/photonos/5/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -160,9 +150,9 @@ "ssh_username": "root" }, "rockylinux-8-arm64": { - "ami": "ami-0662cc201cada14b8", + "ami": "ami-0a21b175629f1a793", "ami_description": "CI Image of RockyLinux 8 arm64", - "ami_name": "salt-project/ci/rockylinux/8/arm64/20240509.1530", + "ami_name": "salt-project/ci/rockylinux/8/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -170,9 +160,9 @@ "ssh_username": "rocky" }, "rockylinux-8": { - "ami": "ami-071ca70a907d79e05", + "ami": "ami-01032695e18f0fe85", "ami_description": "CI Image of RockyLinux 8 x86_64", - "ami_name": "salt-project/ci/rockylinux/8/x86_64/20240509.1530", + "ami_name": "salt-project/ci/rockylinux/8/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -180,9 +170,9 @@ "ssh_username": "rocky" }, "rockylinux-9-arm64": { - "ami": "ami-065842dfdf03a1a03", + "ami": "ami-0c9147ca5f07effc6", "ami_description": "CI Image of RockyLinux 9 arm64", - "ami_name": "salt-project/ci/rockylinux/9/arm64/20240509.1530", + "ami_name": "salt-project/ci/rockylinux/9/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -190,9 +180,9 @@ "ssh_username": "rocky" }, "rockylinux-9": { - "ami": "ami-09f5d6df00e99ba16", + "ami": "ami-01a72f34d198efc4a", "ami_description": "CI Image of RockyLinux 9 x86_64", - "ami_name": "salt-project/ci/rockylinux/9/x86_64/20240509.1530", + "ami_name": "salt-project/ci/rockylinux/9/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -200,9 +190,9 @@ "ssh_username": "rocky" }, "ubuntu-20.04-arm64": { - "ami": "ami-00171fa604b826054", + "ami": "ami-0bf8ea4c07a88d6c5", "ami_description": "CI Image of Ubuntu 20.04 arm64", - "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20240509.1530", + "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -210,9 +200,9 @@ "ssh_username": "ubuntu" }, "ubuntu-20.04": { - "ami": "ami-07ddfbdc489064022", + "ami": "ami-08a84f7455622c3d5", "ami_description": "CI Image of Ubuntu 20.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20240509.1530", + "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -220,9 +210,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04-arm64": { - "ami": "ami-0e6b6fc1dd298e055", + "ami": "ami-0415a2d2279277d61", "ami_description": "CI Image of Ubuntu 22.04 arm64", - "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20240509.1530", + "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -230,9 +220,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04": { - "ami": "ami-0736289579c0d01ba", + "ami": "ami-055513129ce06397c", "ami_description": "CI Image of Ubuntu 22.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20240509.1530", + "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -240,9 +230,9 @@ "ssh_username": "ubuntu" }, "ubuntu-24.04-arm64": { - "ami": "ami-015058823f69446b3", + "ami": "ami-035ef6d54ec25b0fa", "ami_description": "CI Image of Ubuntu 24.04 arm64", - "ami_name": "salt-project/ci/ubuntu/24.04/arm64/20240509.1530", + "ami_name": "salt-project/ci/ubuntu/24.04/arm64/20240912.2136", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -250,9 +240,9 @@ "ssh_username": "ubuntu" }, "ubuntu-24.04": { - "ami": "ami-0eb04152e7cafaaf9", + "ami": "ami-0a287b781a487ec65", "ami_description": "CI Image of Ubuntu 24.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/24.04/x86_64/20240509.1530", + "ami_name": "salt-project/ci/ubuntu/24.04/x86_64/20240912.2136", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -260,9 +250,9 @@ "ssh_username": "ubuntu" }, "windows-2016": { - "ami": "ami-06026cb4d83072df5", + "ami": "ami-030cdb60764141f56", "ami_description": "CI Image of Windows 2016 x86_64", - "ami_name": "salt-project/ci/windows/2016/x86_64/20240509.1530", + "ami_name": "salt-project/ci/windows/2016/x86_64/20240913.1756", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -270,9 +260,9 @@ "ssh_username": "Administrator" }, "windows-2019": { - "ami": "ami-095a9256ec0e8261c", + "ami": "ami-08f10b0d4914572de", "ami_description": "CI Image of Windows 2019 x86_64", - "ami_name": "salt-project/ci/windows/2019/x86_64/20240509.1530", + "ami_name": "salt-project/ci/windows/2019/x86_64/20240913.1756", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -280,9 +270,9 @@ "ssh_username": "Administrator" }, "windows-2022": { - "ami": "ami-0d295c0711e513c05", + "ami": "ami-07eda52ffbd76a4c6", "ami_description": "CI Image of Windows 2022 x86_64", - "ami_name": "salt-project/ci/windows/2022/x86_64/20240509.1530", + "ami_name": "salt-project/ci/windows/2022/x86_64/20240913.1756", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 9cd0641c739b..038071329d9e 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -4,7 +4,6 @@ relenv_version: "0.17.0" mandatory_os_slugs: - rockylinux-9 - amazonlinux-2023-arm64 - - archlinux-lts - photonos-5-arm64 - macos-12 - ubuntu-24.04-arm64 diff --git a/tests/pytests/functional/states/test_pkg.py b/tests/pytests/functional/states/test_pkg.py index a56f06667e44..230491d77c60 100644 --- a/tests/pytests/functional/states/test_pkg.py +++ b/tests/pytests/functional/states/test_pkg.py @@ -58,7 +58,7 @@ def refresh_keys(grains, modules): def PKG_TARGETS(grains): _PKG_TARGETS = ["figlet", "sl"] if grains["os"] == "Windows": - _PKG_TARGETS = ["7zip", "putty"] + _PKG_TARGETS = ["npp_x64", "winrar"] elif grains["os"] == "Amazon": if grains["osfinger"] == "Amazon Linux-2023": _PKG_TARGETS = ["lynx", "gnuplot-minimal"] @@ -118,7 +118,7 @@ def PKG_32_TARGETS(grains): else: _PKG_32_TARGETS.append("xz-devel.i686") elif grains["os"] == "Windows": - _PKG_32_TARGETS = ["npp", "nsis"] + _PKG_32_TARGETS = ["npp", "putty"] if not _PKG_32_TARGETS: pytest.skip("No 32 bit packages have been specified for testing") return _PKG_32_TARGETS @@ -217,12 +217,16 @@ def install_7zip(modules): try: modules.pkg.install(name="7zip", version="22.01.00.0") modules.pkg.install(name="7zip", version="19.00.00.0") - assert modules.pkg.version("7zip") == "19.00.00.0,22.01.00.0" + versions = modules.pkg.version("7zip") + assert "19.00.00.0" in versions + assert "22.01.00.0" in versions yield finally: modules.pkg.remove(name="7zip", version="19.00.00.0") modules.pkg.remove(name="7zip", version="22.01.00.0") - assert modules.pkg.version("7zip") == "" + versions = modules.pkg.version("7zip") + assert "19.00.00.0" not in versions + assert "22.01.00.0" not in versions @pytest.mark.requires_salt_modules("pkg.version") @@ -1125,4 +1129,4 @@ def test_pkg_removed_with_version_multiple(install_7zip, modules, states): ret = states.pkg.removed(name="7zip", version="19.00.00.0") assert ret.result is True current = modules.pkg.version("7zip") - assert current == "22.01.00.0" + assert "22.01.00.0" in current diff --git a/tools/ci.py b/tools/ci.py index 391214e69a38..0791fabe90bb 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -1010,7 +1010,6 @@ def get_pkg_downloads_matrix(ctx: Context): "photon", ) linux_skip_pkg_download_tests = ( - "archlinux-lts", "opensuse-15", "windows", ) diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index aa844b904ccc..b60371aa80cb 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -51,7 +51,6 @@ display_name="Amazon Linux 2023 Arm64", arch="arm64", ), - Linux(slug="archlinux-lts", display_name="Arch Linux LTS", arch="x86_64"), Linux(slug="debian-11", display_name="Debian 11", arch="x86_64"), Linux(slug="debian-11-arm64", display_name="Debian 11 Arm64", arch="arm64"), Linux(slug="debian-12", display_name="Debian 12", arch="x86_64"),