chore: fixup test instances

Author: dafyddj

.copier-answers.ssf-ci.yml

@@ -8,4 +8,12 @@ renovate_extend_presets:
 - github>saltstack-formulas/.github:copier
 renovate_ignore_presets: []
 supported_oses:
+- AlmaLinux OS
+- Amazon Linux
+- CentOS
 - Debian
+- Fedora Linux
+- openSUSE
+- Oracle Linux
+- Rocky Linux
+- Ubuntu

.gitlab-ci.yml

@@ -137,46 +137,64 @@ rubocop:
 # OpenSUSE master branch will fail until zypperpkg module is back in salt core
 # https://github.com/saltstack/great-module-migration/issues/14
 #
-<<<<<<< before updating
-# The alias states were removed in the great module migration, causing the tests to fail with Salt master branch
-# See https://github.com/saltstack-formulas/postfix-formula/issues/134
-debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
-debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
-ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
-ubuntu-2004-master-py3: {extends: '.test_instance_failure_permitted'}
-centos-stream9-master-py3: {extends: '.test_instance_failure_permitted'}
-opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
-opensuse-leap-155-master-py3: {extends: '.test_instance_failure_permitted'}
-fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
-fedora-40-master-py3: {extends: '.test_instance_failure_permitted'}
-debian-12-3007-1-py3: {extends: '.test_instance'}
-debian-11-3007-1-py3: {extends: '.test_instance'}
-ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
-ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
-ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
-centos-stream9-3007-1-py3: {extends: '.test_instance'}
-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
-fedora-40-3007-1-py3: {extends: '.test_instance'}
-debian-12-3006-10-py3: {extends: '.test_instance'}
-debian-11-3006-10-py3: {extends: '.test_instance'}
-ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
-ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
-ubuntu-2004-3006-10-py3: {extends: '.test_instance'}
-opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
-fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
-fedora-40-3006-10-py3: {extends: '.test_instance'}
-=======
+almalinux-9-master: {extends: '.test_instance_failure_permitted'}
+almalinux-8-master: {extends: '.test_instance_failure_permitted'}
+amazonlinux-2023-master: {extends: '.test_instance_failure_permitted'}
+amazonlinux-2-master: {extends: '.test_instance_failure_permitted'}
+centos-stream9-master: {extends: '.test_instance_failure_permitted'}
+>>>>>>> after updating
 debian-12-master: {extends: '.test_instance_failure_permitted'}
 debian-11-master: {extends: '.test_instance_failure_permitted'}
+fedora-41-master: {extends: '.test_instance_failure_permitted'}
+fedora-40-master: {extends: '.test_instance_failure_permitted'}
+opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
+opensuse-leap-155-master: {extends: '.test_instance_failure_permitted'}
+opensuse-tmbl-latest-master: {extends: '.test_instance_failure_permitted'}
+oraclelinux-9-master: {extends: '.test_instance_failure_permitted'}
+oraclelinux-8-master: {extends: '.test_instance_failure_permitted'}
+rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
+rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
+ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
+ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
+ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
+almalinux-9-3007-2: {extends: '.test_instance'}
+almalinux-8-3007-2: {extends: '.test_instance'}
+amazonlinux-2023-3007-2: {extends: '.test_instance'}
+amazonlinux-2-3007-2: {extends: '.test_instance'}
+centos-stream9-3007-2: {extends: '.test_instance'}
 debian-12-3007-2: {extends: '.test_instance'}
 debian-11-3007-2: {extends: '.test_instance'}
+fedora-41-3007-2: {extends: '.test_instance'}
+fedora-40-3007-2: {extends: '.test_instance'}
+opensuse-leap-156-3007-2: {extends: '.test_instance'}
+opensuse-leap-155-3007-2: {extends: '.test_instance'}
+opensuse-tmbl-latest-3007-2: {extends: '.test_instance'}
+oraclelinux-9-3007-2: {extends: '.test_instance'}
+oraclelinux-8-3007-2: {extends: '.test_instance'}
+rockylinux-9-3007-2: {extends: '.test_instance'}
+rockylinux-8-3007-2: {extends: '.test_instance'}
+ubuntu-2404-3007-2: {extends: '.test_instance'}
+ubuntu-2204-3007-2: {extends: '.test_instance'}
+ubuntu-2004-3007-2: {extends: '.test_instance'}
+almalinux-9-3006-10: {extends: '.test_instance'}
+almalinux-8-3006-10: {extends: '.test_instance'}
+amazonlinux-2023-3006-10: {extends: '.test_instance'}
+amazonlinux-2-3006-10: {extends: '.test_instance'}
+centos-stream9-3006-10: {extends: '.test_instance'}
 debian-12-3006-10: {extends: '.test_instance'}
 debian-11-3006-10: {extends: '.test_instance'}
->>>>>>> after updating
+fedora-41-3006-10: {extends: '.test_instance'}
+fedora-40-3006-10: {extends: '.test_instance'}
+opensuse-leap-156-3006-10: {extends: '.test_instance'}
+opensuse-leap-155-3006-10: {extends: '.test_instance'}
+opensuse-tmbl-latest-3006-10: {extends: '.test_instance'}
+oraclelinux-9-3006-10: {extends: '.test_instance'}
+oraclelinux-8-3006-10: {extends: '.test_instance'}
+rockylinux-9-3006-10: {extends: '.test_instance'}
+rockylinux-8-3006-10: {extends: '.test_instance'}
+ubuntu-2404-3006-10: {extends: '.test_instance'}
+ubuntu-2204-3006-10: {extends: '.test_instance'}
+ubuntu-2004-3006-10: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################