diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43c2325..0a2408d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,67 +175,67 @@ 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'} +# 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-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_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-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-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_failure_permitted'} +default-fedora-40-3007-1-py3: {extends: '.test_instance'} +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'} +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-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_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'} +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 ############################################################################### diff --git a/kitchen.yml b/kitchen.yml index 981f5ff..ecfb0ca 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-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-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-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-3007.1-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.10` + - name: debian-12-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:debian-10 + image: saltimages/salt-3006.10-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-9-3003-4-py3 + - name: debian-11-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:debian-9 + image: saltimages/salt-3006.10-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-4-py3 + - name: ubuntu-2404-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:ubuntu-20.04 + image: saltimages/salt-3006.10-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-4-py3 + - name: ubuntu-2204-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:ubuntu-18.04 + image: saltimages/salt-3006.10-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: centos-stream8-3003-4-py3 + - name: ubuntu-2004-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:centos-stream8 - - name: centos-7-3003-4-py3 + image: saltimages/salt-3006.10-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd + - name: centos-stream9-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:centos-7 - - name: amazonlinux-2-3003-4-py3 + image: saltimages/salt-3006.10-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:amazonlinux-2 - - name: oraclelinux-8-3003-4-py3 + 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-10-py3 driver: - image: saltimages/salt-3003.4-py3:oraclelinux-8 - - name: oraclelinux-7-3003-4-py3 + 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-10-py3 driver: - image: saltimages/salt-3003.4-py3:oraclelinux-7 - - name: almalinux-8-3003-4-py3 + 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-10-py3 driver: - image: saltimages/salt-3003.4-py3:almalinux-8 + image: saltimages/salt-3006.10-py3:fedora-41 + - name: fedora-40-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:fedora-40 + - name: amazonlinux-2023-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:amazonlinux-2 + - name: oraclelinux-9-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:oraclelinux-9 + - name: oraclelinux-8-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:oraclelinux-8 + - name: almalinux-9-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:almalinux-9 + - name: almalinux-8-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:almalinux-8 + - name: rockylinux-9-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:rockylinux-9 + - name: rockylinux-8-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:rockylinux-8 + verifier: # https://www.inspec.io/ 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/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 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