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

Update to the latest golden images

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-10-06 08:17:24 +01:00 • committed by Pedro Algarvio
parent 834bb2d9e6
commit 72cb90835d
2 changed files with 82 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
cicd/golden-images.json
View file

@ -1,8 +1,8 @@
{
"almalinux-8-arm64": {
"ami": "ami-0f08fc00f1689a8ec",
"ami": "ami-04c86a9990a3836b9",
"ami_description": "CI Image of AlmaLinux 8 arm64",
"ami_name": "salt-project/ci/almalinux/8/arm64/20231003.2057",
"ami_name": "salt-project/ci/almalinux/8/arm64/20231005.1556",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -10,9 +10,9 @@
"ssh_username": "ec2-user"
},
"almalinux-8": {
"ami": "ami-08f648e0e6fa619c2",
"ami": "ami-059ed5c00c02c564b",
"ami_description": "CI Image of AlmaLinux 8 x86_64",
"ami_name": "salt-project/ci/almalinux/8/x86_64/20231003.2058",
"ami_name": "salt-project/ci/almalinux/8/x86_64/20231005.1557",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -20,9 +20,9 @@
"ssh_username": "ec2-user"
},
"almalinux-9-arm64": {
"ami": "ami-0394b210e1e09b962",
"ami": "ami-0213f3e31656f7393",
"ami_description": "CI Image of AlmaLinux 9 arm64",
"ami_name": "salt-project/ci/almalinux/9/arm64/20231003.2058",
"ami_name": "salt-project/ci/almalinux/9/arm64/20231005.1557",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -30,9 +30,9 @@
"ssh_username": "ec2-user"
},
"almalinux-9": {
"ami": "ami-0a909a150cfebea5b",
"ami": "ami-0c4e36d63e728ee21",
"ami_description": "CI Image of AlmaLinux 9 x86_64",
"ami_name": "salt-project/ci/almalinux/9/x86_64/20231003.2100",
"ami_name": "salt-project/ci/almalinux/9/x86_64/20231005.1557",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -40,9 +40,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2-arm64": {
"ami": "ami-038eac6a08feecdb2",
"ami": "ami-010d24ab23bfb0330",
"ami_description": "CI Image of AmazonLinux 2 arm64",
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20231003.2104",
"ami_name": "salt-project/ci/amazonlinux/2/arm64/20231005.1614",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -50,9 +50,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2": {
"ami": "ami-09682e96e7785642d",
"ami": "ami-0ad016fe17f923c6b",
"ami_description": "CI Image of AmazonLinux 2 x86_64",
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231003.2104",
"ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231005.1614",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -60,9 +60,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2023.1-arm64": {
"ami": "ami-0e46c84fb43817334",
"ami": "ami-037b7d6177ec8259d",
"ami_description": "CI Image of AmazonLinux 2023.1 arm64",
"ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231003.2103",
"ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231005.1555",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -70,9 +70,9 @@
"ssh_username": "ec2-user"
},
"amazonlinux-2023.1": {
"ami": "ami-0ac591368ec230345",
"ami": "ami-08e04f6dd44c858fa",
"ami_description": "CI Image of AmazonLinux 2023.1 x86_64",
"ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231003.2103",
"ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231005.1555",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -80,9 +80,9 @@
"ssh_username": "ec2-user"
},
"archlinux-lts": {
"ami": "ami-017de6f1e636021a0",
"ami": "ami-0b88ddfb321aff9ba",
"ami_description": "CI Image of ArchLinux lts x86_64",
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20231003.2108",
"ami_name": "salt-project/ci/archlinux/lts/x86_64/20231005.1555",
"arch": "x86_64",
"cloudwatch-agent-available": "false",
"instance_type": "t3a.large",
@ -90,9 +90,9 @@
"ssh_username": "arch"
},
"centos-7-arm64": {
"ami": "ami-088cb5f3066efa748",
"ami": "ami-01d5ee66081a02154",
"ami_description": "CI Image of CentOS 7 arm64",
"ami_name": "salt-project/ci/centos/7/arm64/20231003.2108",
"ami_name": "salt-project/ci/centos/7/arm64/20231005.1617",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -100,9 +100,9 @@
"ssh_username": "centos"
},
"centos-7": {
"ami": "ami-05c4056c36cecc136",
"ami": "ami-020fcff1da1f72f27",
"ami_description": "CI Image of CentOS 7 x86_64",
"ami_name": "salt-project/ci/centos/7/x86_64/20231003.2107",
"ami_name": "salt-project/ci/centos/7/x86_64/20231005.1616",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -110,9 +110,9 @@
"ssh_username": "centos"
},
"centosstream-8-arm64": {
"ami": "ami-0e2a761782490f7c2",
"ami": "ami-0ac6238b6506f7b8f",
"ami_description": "CI Image of CentOSStream 8 arm64",
"ami_name": "salt-project/ci/centosstream/8/arm64/20231003.2109",
"ami_name": "salt-project/ci/centosstream/8/arm64/20231005.1614",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -120,9 +120,9 @@
"ssh_username": "centos"
},
"centosstream-8": {
"ami": "ami-06178cd094ea71c34",
"ami": "ami-0bfceb03d43d0ba0e",
"ami_description": "CI Image of CentOSStream 8 x86_64",
"ami_name": "salt-project/ci/centosstream/8/x86_64/20231003.2108",
"ami_name": "salt-project/ci/centosstream/8/x86_64/20231005.1615",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -130,9 +130,9 @@
"ssh_username": "centos"
},
"centosstream-9-arm64": {
"ami": "ami-0ea1025028e6fe700",
"ami": "ami-04db23ba9082a01bf",
"ami_description": "CI Image of CentOSStream 9 arm64",
"ami_name": "salt-project/ci/centosstream/9/arm64/20231003.2109",
"ami_name": "salt-project/ci/centosstream/9/arm64/20231005.1615",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -140,9 +140,9 @@
"ssh_username": "ec2-user"
},
"centosstream-9": {
"ami": "ami-0f474b360fca72512",
"ami": "ami-0a47f4f785cb7a81c",
"ami_description": "CI Image of CentOSStream 9 x86_64",
"ami_name": "salt-project/ci/centosstream/9/x86_64/20231003.2109",
"ami_name": "salt-project/ci/centosstream/9/x86_64/20231005.1615",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -150,9 +150,9 @@
"ssh_username": "ec2-user"
},
"debian-10-arm64": {
"ami": "ami-0b9cbee875ae2e145",
"ami": "ami-015d30e48fa213528",
"ami_description": "CI Image of Debian 10 arm64",
"ami_name": "salt-project/ci/debian/10/arm64/20231003.2114",
"ami_name": "salt-project/ci/debian/10/arm64/20231005.1601",
"arch": "arm64",
"cloudwatch-agent-available": "false",
"instance_type": "m6g.large",
@ -160,9 +160,9 @@
"ssh_username": "admin"
},
"debian-10": {
"ami": "ami-03b713e88ac915c18",
"ami": "ami-0397043698fedfa4c",
"ami_description": "CI Image of Debian 10 x86_64",
"ami_name": "salt-project/ci/debian/10/x86_64/20231003.2112",
"ami_name": "salt-project/ci/debian/10/x86_64/20231005.1606",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -170,9 +170,9 @@
"ssh_username": "admin"
},
"debian-11-arm64": {
"ami": "ami-0e48f24d9def8d84c",
"ami": "ami-008dbab5525972174",
"ami_description": "CI Image of Debian 11 arm64",
"ami_name": "salt-project/ci/debian/11/arm64/20231003.2114",
"ami_name": "salt-project/ci/debian/11/arm64/20231005.1607",
"arch": "arm64",
"cloudwatch-agent-available": "false",
"instance_type": "m6g.large",
@ -180,9 +180,9 @@
"ssh_username": "admin"
},
"debian-11": {
"ami": "ami-07a2fb75d29d0d6f7",
"ami": "ami-04fc56501daaf3c94",
"ami_description": "CI Image of Debian 11 x86_64",
"ami_name": "salt-project/ci/debian/11/x86_64/20231003.2116",
"ami_name": "salt-project/ci/debian/11/x86_64/20231005.1607",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -190,9 +190,9 @@
"ssh_username": "admin"
},
"debian-12-arm64": {
"ami": "ami-027199ded9ce9f659",
"ami": "ami-0956b73228a7368c3",
"ami_description": "CI Image of Debian 12 arm64",
"ami_name": "salt-project/ci/debian/12/arm64/20231003.2117",
"ami_name": "salt-project/ci/debian/12/arm64/20231005.1610",
"arch": "arm64",
"cloudwatch-agent-available": "false",
"instance_type": "m6g.large",
@ -200,9 +200,9 @@
"ssh_username": "admin"
},
"debian-12": {
"ami": "ami-02156ad853a403599",
"ami": "ami-0d0aa04bb5c49e54f",
"ami_description": "CI Image of Debian 12 x86_64",
"ami_name": "salt-project/ci/debian/12/x86_64/20231003.2119",
"ami_name": "salt-project/ci/debian/12/x86_64/20231005.1613",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -210,9 +210,9 @@
"ssh_username": "admin"
},
"fedora-37-arm64": {
"ami": "ami-0dfb1b2e3b6cd8847",
"ami": "ami-0201f64fda9f1ca6d",
"ami_description": "CI Image of Fedora 37 arm64",
"ami_name": "salt-project/ci/fedora/37/arm64/20231003.2119",
"ami_name": "salt-project/ci/fedora/37/arm64/20231005.1617",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -220,9 +220,9 @@
"ssh_username": "fedora"
},
"fedora-37": {
"ami": "ami-0d27e014bf07af18b",
"ami": "ami-02dfc80c8b14fd5bc",
"ami_description": "CI Image of Fedora 37 x86_64",
"ami_name": "salt-project/ci/fedora/37/x86_64/20231003.2120",
"ami_name": "salt-project/ci/fedora/37/x86_64/20231005.1618",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -230,9 +230,9 @@
"ssh_username": "fedora"
},
"fedora-38-arm64": {
"ami": "ami-04f5a34bae3040974",
"ami": "ami-0b03c270c7f50165d",
"ami_description": "CI Image of Fedora 38 arm64",
"ami_name": "salt-project/ci/fedora/38/arm64/20231003.2120",
"ami_name": "salt-project/ci/fedora/38/arm64/20231005.1618",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -240,9 +240,9 @@
"ssh_username": "fedora"
},
"fedora-38": {
"ami": "ami-0e69802061ed79891",
"ami": "ami-0927a80620f670c23",
"ami_description": "CI Image of Fedora 38 x86_64",
"ami_name": "salt-project/ci/fedora/38/x86_64/20231003.2123",
"ami_name": "salt-project/ci/fedora/38/x86_64/20231005.1626",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -250,9 +250,9 @@
"ssh_username": "fedora"
},
"opensuse-15": {
"ami": "ami-0ebb684e16914ad0a",
"ami": "ami-0b51e3479fabb4078",
"ami_description": "CI Image of Opensuse 15 x86_64",
"ami_name": "salt-project/ci/opensuse/15/x86_64/20231003.2110",
"ami_name": "salt-project/ci/opensuse/15/x86_64/20231005.1614",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -260,9 +260,9 @@
"ssh_username": "ec2-user"
},
"photonos-3-arm64": {
"ami": "ami-054765b3beb6dd97c",
"ami": "ami-0a33037524874686c",
"ami_description": "CI Image of PhotonOS 3 arm64",
"ami_name": "salt-project/ci/photonos/3/arm64/20231003.2129",
"ami_name": "salt-project/ci/photonos/3/arm64/20231005.1558",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -270,9 +270,9 @@
"ssh_username": "root"
},
"photonos-3": {
"ami": "ami-0224e8a4471113ebb",
"ami": "ami-068c5c07aa91d84d1",
"ami_description": "CI Image of PhotonOS 3 x86_64",
"ami_name": "salt-project/ci/photonos/3/x86_64/20231003.2128",
"ami_name": "salt-project/ci/photonos/3/x86_64/20231005.1558",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -280,9 +280,9 @@
"ssh_username": "root"
},
"photonos-4-arm64": {
"ami": "ami-091f6d77aa3921394",
"ami": "ami-0f8c72854c5b5679c",
"ami_description": "CI Image of PhotonOS 4 arm64",
"ami_name": "salt-project/ci/photonos/4/arm64/20231003.2124",
"ami_name": "salt-project/ci/photonos/4/arm64/20231005.1558",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -290,9 +290,9 @@
"ssh_username": "root"
},
"photonos-4": {
"ami": "ami-0714704e9471a8e0c",
"ami": "ami-04b8974b830b5adb0",
"ami_description": "CI Image of PhotonOS 4 x86_64",
"ami_name": "salt-project/ci/photonos/4/x86_64/20231003.2130",
"ami_name": "salt-project/ci/photonos/4/x86_64/20231005.1559",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -300,9 +300,9 @@
"ssh_username": "root"
},
"photonos-5-arm64": {
"ami": "ami-05ebc5bddb487c20b",
"ami": "ami-0f466b198cbcaf380",
"ami_description": "CI Image of PhotonOS 5 arm64",
"ami_name": "salt-project/ci/photonos/5/arm64/20231003.2130",
"ami_name": "salt-project/ci/photonos/5/arm64/20231005.1559",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -310,9 +310,9 @@
"ssh_username": "root"
},
"photonos-5": {
"ami": "ami-0b7e17bc1990da3af",
"ami": "ami-01bb09f84464b243e",
"ami_description": "CI Image of PhotonOS 5 x86_64",
"ami_name": "salt-project/ci/photonos/5/x86_64/20231003.2131",
"ami_name": "salt-project/ci/photonos/5/x86_64/20231005.1601",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -320,9 +320,9 @@
"ssh_username": "root"
},
"ubuntu-20.04-arm64": {
"ami": "ami-09210544c9163df86",
"ami": "ami-06d9a9e3b5ae369c7",
"ami_description": "CI Image of Ubuntu 20.04 arm64",
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231003.2110",
"ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231005.1555",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -330,9 +330,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-20.04": {
"ami": "ami-05894335447f4c052",
"ami": "ami-080a55fb6cb08134d",
"ami_description": "CI Image of Ubuntu 20.04 x86_64",
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231003.2110",
"ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231005.1555",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -340,9 +340,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-22.04-arm64": {
"ami": "ami-090423dbe605f6d3e",
"ami": "ami-0c87b8f0b8794f32e",
"ami_description": "CI Image of Ubuntu 22.04 arm64",
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231003.2111",
"ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231005.1555",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -350,9 +350,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-22.04": {
"ami": "ami-0a465357b34ea7fdc",
"ami": "ami-0ce98043f227c9ac0",
"ami_description": "CI Image of Ubuntu 22.04 x86_64",
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231003.2111",
"ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231005.1555",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -360,9 +360,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-23.04-arm64": {
"ami": "ami-0ed81524d646f95ee",
"ami": "ami-0519c583e36309fef",
"ami_description": "CI Image of Ubuntu 23.04 arm64",
"ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231003.2111",
"ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231005.1555",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
@ -370,9 +370,9 @@
"ssh_username": "ubuntu"
},
"ubuntu-23.04": {
"ami": "ami-02c7edd6357be51b6",
"ami": "ami-063ad5dfb49f09182",
"ami_description": "CI Image of Ubuntu 23.04 x86_64",
"ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231003.2112",
"ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231005.1555",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
@ -380,9 +380,9 @@
"ssh_username": "ubuntu"
},
"windows-2016": {
"ami": "ami-04f113ff291a8953f",
"ami": "ami-0f1ac34593b8b044f",
"ami_description": "CI Image of Windows 2016 x86_64",
"ami_name": "salt-project/ci/windows/2016/x86_64/20231003.2104",
"ami_name": "salt-project/ci/windows/2016/x86_64/20231005.1615",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.xlarge",
@ -390,9 +390,9 @@
"ssh_username": "Administrator"
},
"windows-2019": {
"ami": "ami-06475f495e0151fc9",
"ami": "ami-09100ff6a103a28ab",
"ami_description": "CI Image of Windows 2019 x86_64",
"ami_name": "salt-project/ci/windows/2019/x86_64/20231003.2106",
"ami_name": "salt-project/ci/windows/2019/x86_64/20231005.1615",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.xlarge",
@ -400,9 +400,9 @@
"ssh_username": "Administrator"
},
"windows-2022": {
"ami": "ami-0558da89560480f32",
"ami": "ami-0266dc6a12bc9fca6",
"ami_description": "CI Image of Windows 2022 x86_64",
"ami_name": "salt-project/ci/windows/2022/x86_64/20231003.2106",
"ami_name": "salt-project/ci/windows/2022/x86_64/20231005.1616",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.xlarge",

12
pkg/tests/conftest.py
View file

@ -49,18 +49,6 @@ def _system_up_to_date(
grains,
shell,
):
if grains["os"] == "Ubuntu" and grains["osarch"] == "amd64":
# The grub-efi-amd64-signed package seems to be a problem
# right now when updating the system
env = os.environ.copy()
env["DEBIAN_FRONTEND"] = "noninteractive"
ret = shell.run(
"apt-mark",
"hold",
"grub-efi-amd64-signed",
env=env,
)
assert ret.returncode == 0
if grains["os_family"] == "Debian":
ret = shell.run("apt", "update")
assert ret.returncode == 0