chore: fix up choice of test instances

Author: dafyddj

.gitlab-ci.yml

@@ -137,115 +137,62 @@ 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
-# default-debian-12-master-py3: {extends: '.test_instance'}
-# default-debian-11-master-py3: {extends: '.test_instance'}
-# 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_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-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'}
-=======
-debian-12-master-py3: {extends: '.test_instance'}
-debian-11-master-py3: {extends: '.test_instance'}
-ubuntu-2404-master-py3: {extends: '.test_instance'}
-ubuntu-2204-master-py3: {extends: '.test_instance'}
-ubuntu-2004-master-py3: {extends: '.test_instance'}
-centos-stream9-master-py3: {extends: '.test_instance'}
-opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
-opensuse-leap-155-master-py3: {extends: '.test_instance'}
-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-amazonlinux-2023-master-py3: {extends: '.test_instance'}
-fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
-fedora-40-master-py3: {extends: '.test_instance'}
-oraclelinux-9-master-py3: {extends: '.test_instance'}
-oraclelinux-8-master-py3: {extends: '.test_instance'}
-almalinux-9-master-py3: {extends: '.test_instance'}
-almalinux-8-master-py3: {extends: '.test_instance'}
-rockylinux-9-master-py3: {extends: '.test_instance'}
-rockylinux-8-master-py3: {extends: '.test_instance'}
->>>>>>> after updating
+# debian-12-master-py3: {extends: '.test_instance'}
+# debian-11-master-py3: {extends: '.test_instance'}
+# ubuntu-2404-master-py3: {extends: '.test_instance'}
+# ubuntu-2204-master-py3: {extends: '.test_instance'}
+# ubuntu-2004-master-py3: {extends: '.test_instance'}
+# centos-stream9-master-py3: {extends: '.test_instance'}
+# opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
+# opensuse-leap-155-master-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# amazonlinux-2023-master-py3: {extends: '.test_instance'}
+# fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
+# fedora-40-master-py3: {extends: '.test_instance'}
+# oraclelinux-9-master-py3: {extends: '.test_instance'}
+# oraclelinux-8-master-py3: {extends: '.test_instance'}
+# almalinux-9-master-py3: {extends: '.test_instance'}
+# almalinux-8-master-py3: {extends: '.test_instance'}
+# rockylinux-9-master-py3: {extends: '.test_instance'}
+# rockylinux-8-master-py3: {extends: '.test_instance'}
 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'}
-<<<<<<< before updating
-# 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'}
-=======
-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
-fedora-40-3007-1-py3: {extends: '.test_instance'}
-amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'}
-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
-oraclelinux-9-3007-1-py3: {extends: '.test_instance'}
-oraclelinux-8-3007-1-py3: {extends: '.test_instance'}
-almalinux-9-3007-1-py3: {extends: '.test_instance'}
-almalinux-8-3007-1-py3: {extends: '.test_instance'}
-rockylinux-9-3007-1-py3: {extends: '.test_instance'}
-rockylinux-8-3007-1-py3: {extends: '.test_instance'}
->>>>>>> after updating
+# opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
+# opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
+# fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
+# fedora-40-3007-1-py3: {extends: '.test_instance'}
+# amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'}
+# amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
+# oraclelinux-9-3007-1-py3: {extends: '.test_instance'}
+# oraclelinux-8-3007-1-py3: {extends: '.test_instance'}
+# almalinux-9-3007-1-py3: {extends: '.test_instance'}
+# almalinux-8-3007-1-py3: {extends: '.test_instance'}
+# rockylinux-9-3007-1-py3: {extends: '.test_instance'}
+# rockylinux-8-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'}
 centos-stream9-3006-10-py3: {extends: '.test_instance'}
-<<<<<<< before updating
-# 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'}
-=======
-opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
-opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'}
-fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
-fedora-40-3006-10-py3: {extends: '.test_instance'}
-amazonlinux-2-3006-10-py3: {extends: '.test_instance_failure_permitted'}
-amazonlinux-2023-3006-10-py3: {extends: '.test_instance'}
-oraclelinux-9-3006-10-py3: {extends: '.test_instance'}
-oraclelinux-8-3006-10-py3: {extends: '.test_instance'}
-almalinux-9-3006-10-py3: {extends: '.test_instance'}
-almalinux-8-3006-10-py3: {extends: '.test_instance'}
-rockylinux-9-3006-10-py3: {extends: '.test_instance'}
-rockylinux-8-3006-10-py3: {extends: '.test_instance'}
->>>>>>> after updating
+# opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
+# opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'}
+# fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
+# fedora-40-3006-10-py3: {extends: '.test_instance'}
+# amazonlinux-2-3006-10-py3: {extends: '.test_instance_failure_permitted'}
+# amazonlinux-2023-3006-10-py3: {extends: '.test_instance'}
+# oraclelinux-9-3006-10-py3: {extends: '.test_instance'}
+# oraclelinux-8-3006-10-py3: {extends: '.test_instance'}
+# almalinux-9-3006-10-py3: {extends: '.test_instance'}
+# almalinux-8-3006-10-py3: {extends: '.test_instance'}
+# rockylinux-9-3006-10-py3: {extends: '.test_instance'}
+# rockylinux-8-3006-10-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################