From d53ceae71bfb149e766f0bde28a20a469f2ab5f3 Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Wed, 26 Feb 2025 08:27:37 -0600 Subject: [PATCH 1/7] ci: use latest test images --- .gitlab-ci.yml | 107 ++++++++--------- kitchen.yml | 313 ++++++++++++++++++++++++------------------------- 2 files changed, 201 insertions(+), 219 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42e5e08..aea8d28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,67 +175,62 @@ rubocop: test-formula-conversion: {extends: '.test_conversion'} # REMOVEME> # yamllint disable rule:line-length -# default-debian-11-tiamat-py3: {extends: '.test_instance'} -# default-debian-10-tiamat-py3: {extends: '.test_instance'} -# default-debian-9-tiamat-py3: {extends: '.test_instance'} -# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'} -# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} -# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} -# default-centos-7-tiamat-py3: {extends: '.test_instance'} -# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} -# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} -# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} -# default-almalinux-8-tiamat-py3: {extends: '.test_instance'} -# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} +default-debian-12-master-py3: {extends: '.test_instance'} default-debian-11-master-py3: {extends: '.test_instance'} -default-debian-10-master-py3: {extends: '.test_instance'} -default-debian-9-master-py3: {extends: '.test_instance'} -default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} +default-ubuntu-2404-master-py3: {extends: '.test_instance'} +default-ubuntu-2204-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} -default-ubuntu-1804-master-py3: {extends: '.test_instance'} -default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} -default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} -default-fedora-35-master-py3: {extends: '.test_instance'} -default-opensuse-leap-153-master-py3: {extends: '.test_instance'} -default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} -default-amazonlinux-2-master-py3: {extends: '.test_instance_failure_permitted'} +default-centos-stream9-master-py3: {extends: '.test_instance'} +default-opensuse-leap-156-master-py3: {extends: '.test_instance'} +default-opensuse-leap-155-master-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +default-amazonlinux-2023-master-py3: {extends: '.test_instance'} +default-fedora-41-master-1-py3: {extends: '.test_instance'} +default-fedora-40-master-1-py3: {extends: '.test_instance'} +default-oraclelinux-9-master-py3: {extends: '.test_instance'} default-oraclelinux-8-master-py3: {extends: '.test_instance'} -default-arch-base-latest-master-py3: {extends: '.test_instance'} -default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} -default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} +default-almalinux-9-master-py3: {extends: '.test_instance'} default-almalinux-8-master-py3: {extends: '.test_instance'} +default-rockylinux-9-master-py3: {extends: '.test_instance'} default-rockylinux-8-master-py3: {extends: '.test_instance'} -# default-debian-11-3004-1-py3: {extends: '.test_instance'} -# default-debian-10-3004-1-py3: {extends: '.test_instance'} -# default-debian-9-3004-1-py3: {extends: '.test_instance'} -# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'} -# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} -# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'} -# default-centos-7-3004-1-py3: {extends: '.test_instance'} -# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'} -# default-fedora-35-3004-1-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'} -# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'} -# default-almalinux-8-3004-1-py3: {extends: '.test_instance'} -# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} -# default-debian-10-3003-4-py3: {extends: '.test_instance'} -# default-debian-9-3003-4-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} -# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'} -# default-centos-7-3003-4-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'} -# default-almalinux-8-3003-4-py3: {extends: '.test_instance'} +default-debian-12-3007-1-py3: {extends: '.test_instance'} +default-debian-11-3007-1-py3: {extends: '.test_instance'} +default-ubuntu-2404-3007-1-py3: {extends: '.test_instance'} +default-ubuntu-2204-3007-1-py3: {extends: '.test_instance'} +default-ubuntu-2004-3007-1-py3: {extends: '.test_instance'} +default-centos-stream9-3007-1-py3: {extends: '.test_instance'} +default-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'} +default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'} +default-fedora-41-3007-1-py3: {extends: '.test_instance'} +default-fedora-40-3007-1-py3: {extends: '.test_instance'} +default-amazonlinux-2-3007-1-py3: {extends: '.test_instance'} +default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'} +default-oraclelinux-9-3007-1-py3: {extends: '.test_instance'} +default-oraclelinux-8-3007-1-py3: {extends: '.test_instance'} +default-almalinux-9-3007-1-py3: {extends: '.test_instance'} +default-almalinux-8-3007-1-py3: {extends: '.test_instance'} +default-rockylinux-9-3007-1-py3: {extends: '.test_instance'} +default-rockylinux-8-3007-1-py3: {extends: '.test_instance'} +default-debian-12-3006-9-py3: {extends: '.test_instance'} +default-debian-11-3006-9-py3: {extends: '.test_instance'} +default-ubuntu-2404-3006-9-py3: {extends: '.test_instance'} +default-ubuntu-2204-3006-9-py3: {extends: '.test_instance'} +default-ubuntu-2004-3006-9-py3: {extends: '.test_instance'} +default-centos-stream9-3006-9-py3: {extends: '.test_instance'} +default-opensuse-leap-156-3006-9-py3: {extends: '.test_instance'} +default-opensuse-leap-155-3006-9-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-3006-9-py3: {extends: '.test_instance'} +default-fedora-41-3006-9-py3: {extends: '.test_instance'} +default-fedora-40-3006-9-py3: {extends: '.test_instance'} +default-amazonlinux-2-3006-9-py3: {extends: '.test_instance'} +default-amazonlinux-2023-3006-9-py3: {extends: '.test_instance'} +default-oraclelinux-9-3006-9-py3: {extends: '.test_instance'} +default-oraclelinux-8-3006-9-py3: {extends: '.test_instance'} +default-almalinux-9-3006-9-py3: {extends: '.test_instance'} +default-almalinux-8-3006-9-py3: {extends: '.test_instance'} +default-rockylinux-9-3006-9-py3: {extends: '.test_instance'} +default-rockylinux-8-3006-9-py3: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/kitchen.yml b/kitchen.yml index 981f5ff..d2cacbd 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -21,65 +21,18 @@ provisioner: - test/salt/pillar platforms: - ## SALT `tiamat` - - name: debian-11-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:debian-11 - run_command: /lib/systemd/systemd - - name: debian-10-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-2204-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-22.04 - run_command: /lib/systemd/systemd - - name: ubuntu-2004-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: centos-stream8-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:centos-stream8 - - name: centos-7-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:centos-7 - - name: amazonlinux-2-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:amazonlinux-2 - - name: oraclelinux-8-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:oraclelinux-8 - - name: oraclelinux-7-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:oraclelinux-7 - - name: almalinux-8-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:almalinux-8 - - name: rockylinux-8-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:rockylinux-8 - ## SALT `master` + - name: debian-12-master-py3 + driver: + image: saltimages/salt-master-py3:debian-12 + run_command: /lib/systemd/systemd - name: debian-11-master-py3 driver: image: saltimages/salt-master-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-master-py3 + - name: ubuntu-2404-master-py3 driver: - image: saltimages/salt-master-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-master-py3 - driver: - image: saltimages/salt-master-py3:debian-9 + image: saltimages/salt-master-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - name: ubuntu-2204-master-py3 driver: @@ -89,26 +42,20 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-master-py3 + - name: centos-stream9-master-py3 driver: - image: saltimages/salt-master-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: centos-stream8-master-py3 + image: saltimages/salt-master-py3:centos-stream9 + - name: opensuse-leap-156-master-py3 driver: - image: saltimages/salt-master-py3:centos-stream8 - - name: centos-7-master-py3 + image: saltimages/salt-master-py3:opensuse-leap-15.6 + # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-155-master-py3 driver: - image: saltimages/salt-master-py3:centos-7 - - name: fedora-36-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-36 - - name: fedora-35-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-35 - - name: opensuse-leap-153-master-py3 - driver: - image: saltimages/salt-master-py3:opensuse-leap-15.3 - # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + image: saltimages/salt-master-py3:opensuse-leap-15.5 + # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -119,146 +66,186 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-master-py3 + - name: fedora-41-master-py3 driver: - image: saltimages/salt-master-py3:amazonlinux-2 + image: saltimages/salt-master-py3:fedora-41 + - name: fedora-40-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-40 + - name: amazonlinux-2023-master-py3 + driver: + image: saltimages/salt-master-py3:amazonlinux-2023 + - name: oraclelinux-9-master-py3 + driver: + image: saltimages/salt-master-py3:oraclelinux-9 - name: oraclelinux-8-master-py3 driver: image: saltimages/salt-master-py3:oraclelinux-8 - - name: oraclelinux-7-master-py3 + - name: almalinux-9-master-py3 driver: - image: saltimages/salt-master-py3:oraclelinux-7 - - name: arch-base-latest-master-py3 - driver: - image: saltimages/salt-master-py3:arch-base-latest - - name: gentoo-stage3-latest-master-py3 - driver: - image: saltimages/salt-master-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-master-py3 - driver: - image: saltimages/salt-master-py3:gentoo-stage3-systemd + image: saltimages/salt-master-py3:almalinux-9 - name: almalinux-8-master-py3 driver: image: saltimages/salt-master-py3:almalinux-8 + - name: rockylinux-9-master-py3 + driver: + image: saltimages/salt-master-py3:rockylinux-9 - name: rockylinux-8-master-py3 driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3004.1` - - name: debian-11-3004-1-py3 + ## SALT `3007.1` + - name: debian-12-3007-1-py3 driver: - image: saltimages/salt-3004.1-py3:debian-11 + image: saltimages/salt-3007.1-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-10-3004-1-py3 + - name: debian-11-3007-1-py3 driver: - image: saltimages/salt-3004.1-py3:debian-10 + image: saltimages/salt-3007.1-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-9-3004-1-py3 + - name: ubuntu-2404-3007-1-py3 driver: - image: saltimages/salt-3004.1-py3:debian-9 + image: saltimages/salt-3007.1-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3004-1-py3 + - name: ubuntu-2204-3007-1-py3 driver: - image: saltimages/salt-3004.1-py3:ubuntu-22.04 + image: saltimages/salt-3007.1-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3004-1-py3 + - name: ubuntu-2004-3007-1-py3 driver: - image: saltimages/salt-3004.1-py3:ubuntu-20.04 + image: saltimages/salt-3007.1-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3004-1-py3 + - name: centos-stream9-3007-1-py3 driver: - image: saltimages/salt-3004.1-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: centos-stream8-3004-1-py3 + image: saltimages/salt-3007.1-py3:centos-stream9 + - name: opensuse-leap-155-3007-1-py3 driver: - image: saltimages/salt-3004.1-py3:centos-stream8 - - name: centos-7-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:centos-7 - - name: fedora-36-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:fedora-36 - - name: fedora-35-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:fedora-35 - - name: amazonlinux-2-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:amazonlinux-2 - - name: oraclelinux-8-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:oraclelinux-8 - - name: oraclelinux-7-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:oraclelinux-7 - - name: arch-base-latest-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:arch-base-latest - - name: gentoo-stage3-latest-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd - - name: almalinux-8-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:almalinux-8 - - name: rockylinux-8-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:rockylinux-8 - - ## SALT `3004.0` - - name: opensuse-leap-153-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:opensuse-leap-15.3 - # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + image: saltimages/salt-master-py3:opensuse-leap-15.5 + # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3004-0-py3 + - name: opensuse-leap-156-3007-1-py3 driver: - image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest + image: saltimages/salt-master-py3:opensuse-leap-15.6 + # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-3007-1-py3 + driver: + image: saltimages/salt-master-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + - name: fedora-41-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:fedora-41 + - name: fedora-40-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:fedora-40 + - name: amazonlinux-2023-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:amazonlinux-2023 + - name: amazonlinux-2-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:amazonlinux-2 + - name: oraclelinux-9-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:oraclelinux-9 + - name: oraclelinux-8-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:oraclelinux-8 + - name: almalinux-9-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:almalinux-9 + - name: almalinux-8-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:almalinux-8 + - name: rockylinux-9-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:rockylinux-9 + - name: rockylinux-8-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:rockylinux-8 - ## SALT `3003.4` - - name: debian-10-3003-4-py3 + ## SALT `3006.9` + - name: debian-12-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:debian-10 + image: saltimages/salt-3006.9-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-9-3003-4-py3 + - name: debian-11-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:debian-9 + image: saltimages/salt-3006.9-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-4-py3 + - name: ubuntu-2404-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:ubuntu-20.04 + image: saltimages/salt-3006.9-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-4-py3 + - name: ubuntu-2204-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:ubuntu-18.04 + image: saltimages/salt-3006.9-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: centos-stream8-3003-4-py3 + - name: ubuntu-2004-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:centos-stream8 - - name: centos-7-3003-4-py3 + image: saltimages/salt-3006.9-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd + - name: centos-stream9-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:centos-7 - - name: amazonlinux-2-3003-4-py3 + image: saltimages/salt-3006.9-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:amazonlinux-2 - - name: oraclelinux-8-3003-4-py3 + image: saltimages/salt-master-py3:opensuse-tumbleweed-latest + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-156-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:oraclelinux-8 - - name: oraclelinux-7-3003-4-py3 + image: saltimages/salt-master-py3:opensuse-leap-15.6 + # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-155-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:oraclelinux-7 - - name: almalinux-8-3003-4-py3 + image: saltimages/salt-master-py3:opensuse-leap-15.5 + # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: fedora-41-3006-9-py3 driver: - image: saltimages/salt-3003.4-py3:almalinux-8 + image: saltimages/salt-3006.9-py3:fedora-41 + - name: fedora-40-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:fedora-40 + - name: amazonlinux-2023-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:amazonlinux-2 + - name: oraclelinux-9-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:oraclelinux-9 + - name: oraclelinux-8-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:oraclelinux-8 + - name: almalinux-9-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:almalinux-9 + - name: almalinux-8-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:almalinux-8 + - name: rockylinux-9-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:rockylinux-9 + - name: rockylinux-8-3006-9-py3 + driver: + image: saltimages/salt-3006.9-py3:rockylinux-8 + verifier: # https://www.inspec.io/ From a1bdd126089d1e6d222580fe931e2632a9df1ed5 Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Wed, 26 Feb 2025 09:00:19 -0600 Subject: [PATCH 2/7] ci: add mapdata for new os --- .../default/files/_mapdata/almalinux-9.yaml | 44 +++++++++++++++++++ .../files/_mapdata/amazonlinux-2023.yaml | 44 +++++++++++++++++++ .../default/files/_mapdata/debian-12.yaml | 44 +++++++++++++++++++ .../default/files/_mapdata/fedora-40.yaml | 44 +++++++++++++++++++ .../default/files/_mapdata/fedora-41.yaml | 44 +++++++++++++++++++ .../default/files/_mapdata/oraclelinux-9.yaml | 44 +++++++++++++++++++ .../default/files/_mapdata/rockylinux-9.yaml | 44 +++++++++++++++++++ .../default/files/_mapdata/ubuntu-24.yaml | 44 +++++++++++++++++++ 8 files changed, 352 insertions(+) create mode 100644 test/integration/default/files/_mapdata/almalinux-9.yaml create mode 100644 test/integration/default/files/_mapdata/amazonlinux-2023.yaml create mode 100644 test/integration/default/files/_mapdata/debian-12.yaml create mode 100644 test/integration/default/files/_mapdata/fedora-40.yaml create mode 100644 test/integration/default/files/_mapdata/fedora-41.yaml create mode 100644 test/integration/default/files/_mapdata/oraclelinux-9.yaml create mode 100644 test/integration/default/files/_mapdata/rockylinux-9.yaml create mode 100644 test/integration/default/files/_mapdata/ubuntu-24.yaml diff --git a/test/integration/default/files/_mapdata/almalinux-9.yaml b/test/integration/default/files/_mapdata/almalinux-9.yaml new file mode 100644 index 0000000..a4a250e --- /dev/null +++ b/test/integration/default/files/_mapdata/almalinux-9.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# AlmaLinux-9 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar diff --git a/test/integration/default/files/_mapdata/amazonlinux-2023.yaml b/test/integration/default/files/_mapdata/amazonlinux-2023.yaml new file mode 100644 index 0000000..069123c --- /dev/null +++ b/test/integration/default/files/_mapdata/amazonlinux-2023.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# Amazon Linux-2023 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar diff --git a/test/integration/default/files/_mapdata/debian-12.yaml b/test/integration/default/files/_mapdata/debian-12.yaml new file mode 100644 index 0000000..dc46de7 --- /dev/null +++ b/test/integration/default/files/_mapdata/debian-12.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# Debian-12 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-40.yaml b/test/integration/default/files/_mapdata/fedora-40.yaml new file mode 100644 index 0000000..6e5dd5a --- /dev/null +++ b/test/integration/default/files/_mapdata/fedora-40.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# Fedora-40 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-41.yaml b/test/integration/default/files/_mapdata/fedora-41.yaml new file mode 100644 index 0000000..12457f6 --- /dev/null +++ b/test/integration/default/files/_mapdata/fedora-41.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# Fedora-41 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar diff --git a/test/integration/default/files/_mapdata/oraclelinux-9.yaml b/test/integration/default/files/_mapdata/oraclelinux-9.yaml new file mode 100644 index 0000000..7eb1ec9 --- /dev/null +++ b/test/integration/default/files/_mapdata/oraclelinux-9.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# Oracle Linux Server-9 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar diff --git a/test/integration/default/files/_mapdata/rockylinux-9.yaml b/test/integration/default/files/_mapdata/rockylinux-9.yaml new file mode 100644 index 0000000..17a65e8 --- /dev/null +++ b/test/integration/default/files/_mapdata/rockylinux-9.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# Rocky Linux-9 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-24.yaml b/test/integration/default/files/_mapdata/ubuntu-24.yaml new file mode 100644 index 0000000..d2621e1 --- /dev/null +++ b/test/integration/default/files/_mapdata/ubuntu-24.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# Ubuntu-24.04 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar From b71ff7523ae70b8501479ca943b885a1c283bf38 Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:32:30 -0600 Subject: [PATCH 3/7] ci: use latest test images --- .gitlab-ci.yml | 10 ++--- kitchen.yml | 12 ++--- .../default/files/_mapdata/centos-9.yaml | 44 +++++++++++++++++++ 3 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 test/integration/default/files/_mapdata/centos-9.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aea8d28..d7c753c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,12 +181,12 @@ default-ubuntu-2404-master-py3: {extends: '.test_instance'} default-ubuntu-2204-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-centos-stream9-master-py3: {extends: '.test_instance'} -default-opensuse-leap-156-master-py3: {extends: '.test_instance'} +default-opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'} default-opensuse-leap-155-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} default-amazonlinux-2023-master-py3: {extends: '.test_instance'} -default-fedora-41-master-1-py3: {extends: '.test_instance'} -default-fedora-40-master-1-py3: {extends: '.test_instance'} +default-fedora-41-master-py3: {extends: '.test_instance_failure_permitted'} +default-fedora-40-master-py3: {extends: '.test_instance'} default-oraclelinux-9-master-py3: {extends: '.test_instance'} default-oraclelinux-8-master-py3: {extends: '.test_instance'} default-almalinux-9-master-py3: {extends: '.test_instance'} @@ -202,7 +202,7 @@ default-centos-stream9-3007-1-py3: {extends: '.test_instance'} default-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'} default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'} -default-fedora-41-3007-1-py3: {extends: '.test_instance'} +default-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'} default-fedora-40-3007-1-py3: {extends: '.test_instance'} default-amazonlinux-2-3007-1-py3: {extends: '.test_instance'} default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'} @@ -221,7 +221,7 @@ default-centos-stream9-3006-9-py3: {extends: '.test_instance'} default-opensuse-leap-156-3006-9-py3: {extends: '.test_instance'} default-opensuse-leap-155-3006-9-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-3006-9-py3: {extends: '.test_instance'} -default-fedora-41-3006-9-py3: {extends: '.test_instance'} +default-fedora-41-3006-9-py3: {extends: '.test_instance_failure_permitted'} default-fedora-40-3006-9-py3: {extends: '.test_instance'} default-amazonlinux-2-3006-9-py3: {extends: '.test_instance'} default-amazonlinux-2023-3006-9-py3: {extends: '.test_instance'} diff --git a/kitchen.yml b/kitchen.yml index d2cacbd..a21abfa 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -120,21 +120,21 @@ platforms: image: saltimages/salt-3007.1-py3:centos-stream9 - name: opensuse-leap-155-3007-1-py3 driver: - image: saltimages/salt-master-py3:opensuse-leap-15.5 + image: saltimages/salt-3007.1-py3:opensuse-leap-15.5 # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - name: opensuse-leap-156-3007-1-py3 driver: - image: saltimages/salt-master-py3:opensuse-leap-15.6 + image: saltimages/salt-3007.1-py3:opensuse-leap-15.6 # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - name: opensuse-tmbl-latest-3007-1-py3 driver: - image: saltimages/salt-master-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3007.1-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -196,21 +196,21 @@ platforms: image: saltimages/salt-3006.9-py3:centos-stream9 - name: opensuse-tmbl-latest-3006-9-py3 driver: - image: saltimages/salt-master-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3006.9-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - name: opensuse-leap-156-3006-9-py3 driver: - image: saltimages/salt-master-py3:opensuse-leap-15.6 + image: saltimages/salt-3006.9-py3:opensuse-leap-15.6 # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - name: opensuse-leap-155-3006-9-py3 driver: - image: saltimages/salt-master-py3:opensuse-leap-15.5 + image: saltimages/salt-3006.9-py3:opensuse-leap-15.5 # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: diff --git a/test/integration/default/files/_mapdata/centos-9.yaml b/test/integration/default/files/_mapdata/centos-9.yaml new file mode 100644 index 0000000..5f47684 --- /dev/null +++ b/test/integration/default/files/_mapdata/centos-9.yaml @@ -0,0 +1,44 @@ +# yamllint disable rule:indentation rule:line-length +# CentOS Linux-9 +--- +values: + added_in_defaults: defaults_value + added_in_lookup: lookup_value + added_in_pillar: pillar_value + arch: amd64 + config: /etc/template-formula.conf + lookup: + added_in_lookup: lookup_value + master: template-master + winner: lookup + map_jinja: + sources: + - Y:G@osarch + - Y:G@os_family + - Y:G@os + - Y:G@osfinger + - C@TEMPLATE:lookup + - C@TEMPLATE + - Y:G@id + master: template-master + pkg: + name: bash + rootgroup: root + service: + name: systemd-journald + subcomponent: + config: /etc/TEMPLATE-subcomponent-formula.conf + tofs: + files_switch: + - any/path/can/be/used/here + - id + - roles + - osfinger + - os + - os_family + source_files: + TEMPLATE-config-file-file-managed: + - example.tmpl.jinja + TEMPLATE-subcomponent-config-file-file-managed: + - subcomponent-example.tmpl.jinja + winner: pillar From 579a43b7a9c80ccb3bad179c61ee2af50ac139bb Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:25:30 -0500 Subject: [PATCH 4/7] ci: use latest test images --- .gitlab-ci.yml | 5 ++++ kitchen.yml | 78 +++++++++++++++++++++++++------------------------- 2 files changed, 44 insertions(+), 39 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7c753c..2f056e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,6 +175,11 @@ rubocop: test-formula-conversion: {extends: '.test_conversion'} # REMOVEME> # yamllint disable rule:line-length +# Fedora 41+ will permit failure until this PR is merged into kitchen-docker +# https://github.com/test-kitchen/kitchen-docker/pull/427 is merged +# OpenSUSE master branch will fail until zypperpkg module is back in salt core +# https://github.com/saltstack/great-module-migration/issues/14 +# default-debian-12-master-py3: {extends: '.test_instance'} default-debian-11-master-py3: {extends: '.test_instance'} default-ubuntu-2404-master-py3: {extends: '.test_instance'} diff --git a/kitchen.yml b/kitchen.yml index a21abfa..ecfb0ca 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -170,81 +170,81 @@ platforms: driver: image: saltimages/salt-3007.1-py3:rockylinux-8 - ## SALT `3006.9` - - name: debian-12-3006-9-py3 + ## SALT `3006.10` + - name: debian-12-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:debian-12 + image: saltimages/salt-3006.10-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-11-3006-9-py3 + - name: debian-11-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:debian-11 + image: saltimages/salt-3006.10-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3006-9-py3 + - name: ubuntu-2404-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:ubuntu-24.04 + image: saltimages/salt-3006.10-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3006-9-py3 + - name: ubuntu-2204-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:ubuntu-22.04 + image: saltimages/salt-3006.10-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3006-9-py3 + - name: ubuntu-2004-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:ubuntu-20.04 + image: saltimages/salt-3006.10-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3006-9-py3 + - name: centos-stream9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:centos-stream9 - - name: opensuse-tmbl-latest-3006-9-py3 + image: saltimages/salt-3006.10-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3006.10-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-156-3006-9-py3 + - name: opensuse-leap-156-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:opensuse-leap-15.6 + image: saltimages/salt-3006.10-py3:opensuse-leap-15.6 # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-155-3006-9-py3 + - name: opensuse-leap-155-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:opensuse-leap-15.5 + image: saltimages/salt-3006.10-py3:opensuse-leap-15.5 # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: fedora-41-3006-9-py3 + - name: fedora-41-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:fedora-41 - - name: fedora-40-3006-9-py3 + image: saltimages/salt-3006.10-py3:fedora-41 + - name: fedora-40-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:fedora-40 - - name: amazonlinux-2023-3006-9-py3 + image: saltimages/salt-3006.10-py3:fedora-40 + - name: amazonlinux-2023-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:amazonlinux-2023 - - name: amazonlinux-2-3006-9-py3 + image: saltimages/salt-3006.10-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:amazonlinux-2 - - name: oraclelinux-9-3006-9-py3 + image: saltimages/salt-3006.10-py3:amazonlinux-2 + - name: oraclelinux-9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:oraclelinux-9 - - name: oraclelinux-8-3006-9-py3 + image: saltimages/salt-3006.10-py3:oraclelinux-9 + - name: oraclelinux-8-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:oraclelinux-8 - - name: almalinux-9-3006-9-py3 + image: saltimages/salt-3006.10-py3:oraclelinux-8 + - name: almalinux-9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:almalinux-9 - - name: almalinux-8-3006-9-py3 + image: saltimages/salt-3006.10-py3:almalinux-9 + - name: almalinux-8-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:almalinux-8 - - name: rockylinux-9-3006-9-py3 + image: saltimages/salt-3006.10-py3:almalinux-8 + - name: rockylinux-9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:rockylinux-9 - - name: rockylinux-8-3006-9-py3 + image: saltimages/salt-3006.10-py3:rockylinux-9 + - name: rockylinux-8-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:rockylinux-8 + image: saltimages/salt-3006.10-py3:rockylinux-8 verifier: From b41b8dc94bfdb658a881a6f7bded22e912bbb323 Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:33:54 -0500 Subject: [PATCH 5/7] ci: use latest test images --- .gitlab-ci.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f056e3..8d07de3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,25 +217,25 @@ default-almalinux-9-3007-1-py3: {extends: '.test_instance'} default-almalinux-8-3007-1-py3: {extends: '.test_instance'} default-rockylinux-9-3007-1-py3: {extends: '.test_instance'} default-rockylinux-8-3007-1-py3: {extends: '.test_instance'} -default-debian-12-3006-9-py3: {extends: '.test_instance'} -default-debian-11-3006-9-py3: {extends: '.test_instance'} -default-ubuntu-2404-3006-9-py3: {extends: '.test_instance'} -default-ubuntu-2204-3006-9-py3: {extends: '.test_instance'} -default-ubuntu-2004-3006-9-py3: {extends: '.test_instance'} -default-centos-stream9-3006-9-py3: {extends: '.test_instance'} -default-opensuse-leap-156-3006-9-py3: {extends: '.test_instance'} -default-opensuse-leap-155-3006-9-py3: {extends: '.test_instance'} -default-opensuse-tmbl-latest-3006-9-py3: {extends: '.test_instance'} -default-fedora-41-3006-9-py3: {extends: '.test_instance_failure_permitted'} -default-fedora-40-3006-9-py3: {extends: '.test_instance'} -default-amazonlinux-2-3006-9-py3: {extends: '.test_instance'} -default-amazonlinux-2023-3006-9-py3: {extends: '.test_instance'} -default-oraclelinux-9-3006-9-py3: {extends: '.test_instance'} -default-oraclelinux-8-3006-9-py3: {extends: '.test_instance'} -default-almalinux-9-3006-9-py3: {extends: '.test_instance'} -default-almalinux-8-3006-9-py3: {extends: '.test_instance'} -default-rockylinux-9-3006-9-py3: {extends: '.test_instance'} -default-rockylinux-8-3006-9-py3: {extends: '.test_instance'} +default-debian-12-3006-10-py3: {extends: '.test_instance'} +default-debian-11-3006-10-py3: {extends: '.test_instance'} +default-ubuntu-2404-3006-10-py3: {extends: '.test_instance'} +default-ubuntu-2204-3006-10-py3: {extends: '.test_instance'} +default-ubuntu-2004-3006-10-py3: {extends: '.test_instance'} +default-centos-stream9-3006-10-py3: {extends: '.test_instance'} +default-opensuse-leap-156-3006-10-py3: {extends: '.test_instance'} +default-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'} +default-fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'} +default-fedora-40-3006-10-py3: {extends: '.test_instance'} +default-amazonlinux-2-3006-10-py3: {extends: '.test_instance'} +default-amazonlinux-2023-3006-10-py3: {extends: '.test_instance'} +default-oraclelinux-9-3006-10-py3: {extends: '.test_instance'} +default-oraclelinux-8-3006-10-py3: {extends: '.test_instance'} +default-almalinux-9-3006-10-py3: {extends: '.test_instance'} +default-almalinux-8-3006-10-py3: {extends: '.test_instance'} +default-rockylinux-9-3006-10-py3: {extends: '.test_instance'} +default-rockylinux-8-3006-10-py3: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### From 5fb252c0340146cbacdb339cb1a5556f0f85aa8a Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Tue, 25 Mar 2025 10:31:56 -0500 Subject: [PATCH 6/7] ci: use latest test images --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d07de3..a6cb2be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -210,7 +210,7 @@ default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'} default-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'} default-fedora-40-3007-1-py3: {extends: '.test_instance'} default-amazonlinux-2-3007-1-py3: {extends: '.test_instance'} -default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'} +default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance_failure_permitted'} default-oraclelinux-9-3007-1-py3: {extends: '.test_instance'} default-oraclelinux-8-3007-1-py3: {extends: '.test_instance'} default-almalinux-9-3007-1-py3: {extends: '.test_instance'} @@ -228,7 +228,7 @@ default-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'} default-fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'} default-fedora-40-3006-10-py3: {extends: '.test_instance'} -default-amazonlinux-2-3006-10-py3: {extends: '.test_instance'} +default-amazonlinux-2-3006-10-py3: {extends: '.test_instance_failure_permitted'} default-amazonlinux-2023-3006-10-py3: {extends: '.test_instance'} default-oraclelinux-9-3006-10-py3: {extends: '.test_instance'} default-oraclelinux-8-3006-10-py3: {extends: '.test_instance'} From 417ca530dd961d47af6ed2132fddbca835989e6d Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Tue, 25 Mar 2025 10:46:36 -0500 Subject: [PATCH 7/7] ci: use latest test images --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6cb2be..89f60b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,8 +209,8 @@ default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'} default-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'} default-fedora-40-3007-1-py3: {extends: '.test_instance'} -default-amazonlinux-2-3007-1-py3: {extends: '.test_instance'} -default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance_failure_permitted'} +default-amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'} +default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'} default-oraclelinux-9-3007-1-py3: {extends: '.test_instance'} default-oraclelinux-8-3007-1-py3: {extends: '.test_instance'} default-almalinux-9-3007-1-py3: {extends: '.test_instance'}