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

Drop Arch Linux; update latest golden images

Browse source
This commit is contained in:
ScriptAutomate 2024-09-13 15:17:27 -05:00 • committed by Daniel Wozniak
parent 0dc964fb50
commit 77260acfd5
10 changed files with 58 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

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

@ -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

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

@ -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

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

@ -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

1
.gitignore vendored
View file

@ -89,6 +89,7 @@ tests/unit/templates/roots
# Pycharm
.idea
venv/
.venv/
# VS Code
.vscode

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

@ -0,0 +1 @@
Drop Arch Linux support

122
cicd/golden-images.json
View file

@ -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",

1
cicd/shared-gh-workflows-context.yml
View file

@ -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

1
tools/ci.py
View file

@ -1010,7 +1010,6 @@ def get_pkg_downloads_matrix(ctx: Context):
"photon",
)
linux_skip_pkg_download_tests = (
"archlinux-lts",
"opensuse-15",
"windows",
)

1
tools/precommit/workflows.py
View file

@ -51,7 +51,6 @@ TEST_SALT_LISTING = PlatformDefinitions(
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"),