Merge pull request #391 from dafyddj/ci/churn

ci: reduce churn on Salt minor releases

Author: dafyddj

.github/workflows/main.yml

@@ -71,16 +71,16 @@ jobs:
           - ubuntu-2404-master
           - ubuntu-2204-master
           - ubuntu-2004-master
-          - debian-12-3007-7
-          - debian-11-3007-7
-          - ubuntu-2404-3007-7
-          - ubuntu-2204-3007-7
-          - ubuntu-2004-3007-7
-          - debian-12-3006-15
-          - debian-11-3006-15
-          - ubuntu-2404-3006-15
-          - ubuntu-2204-3006-15
-          - ubuntu-2004-3006-15
+          - debian-12-3007
+          - debian-11-3007
+          - ubuntu-2404-3007
+          - ubuntu-2204-3007
+          - ubuntu-2004-3007
+          - debian-12-3006
+          - debian-11-3006
+          - ubuntu-2404-3006
+          - ubuntu-2204-3006
+          - ubuntu-2004-3006
     steps:
       - name: Debug on runner (When re-run with "Enable debug logging" checked)
         if: runner.debug

.gitlab-ci.yml

@@ -222,42 +222,42 @@ 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-7: {extends: '.test_instance'}
-almalinux-8-3007-7: {extends: '.test_instance'}
-amazonlinux-2023-3007-7: {extends: '.test_instance'}
-amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'}
-centos-stream9-3007-7: {extends: '.test_instance'}
-debian-12-3007-7: {extends: '.test_instance'}
-debian-11-3007-7: {extends: '.test_instance'}
-fedora-41-3007-7: {extends: '.test_instance_failure_permitted'}
-fedora-40-3007-7: {extends: '.test_instance'}
-opensuse-leap-156-3007-7: {extends: '.test_instance'}
-opensuse-tmbl-latest-3007-7: {extends: '.test_instance'}
-oraclelinux-9-3007-7: {extends: '.test_instance'}
-oraclelinux-8-3007-7: {extends: '.test_instance'}
-rockylinux-9-3007-7: {extends: '.test_instance'}
-rockylinux-8-3007-7: {extends: '.test_instance'}
-ubuntu-2404-3007-7: {extends: '.test_instance'}
-ubuntu-2204-3007-7: {extends: '.test_instance'}
-ubuntu-2004-3007-7: {extends: '.test_instance'}
-almalinux-9-3006-15: {extends: '.test_instance'}
-almalinux-8-3006-15: {extends: '.test_instance'}
-amazonlinux-2023-3006-15: {extends: '.test_instance'}
-amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'}
-centos-stream9-3006-15: {extends: '.test_instance'}
-debian-12-3006-15: {extends: '.test_instance'}
-debian-11-3006-15: {extends: '.test_instance'}
-fedora-41-3006-15: {extends: '.test_instance_failure_permitted'}
-fedora-40-3006-15: {extends: '.test_instance'}
-opensuse-leap-156-3006-15: {extends: '.test_instance'}
-opensuse-tmbl-latest-3006-15: {extends: '.test_instance'}
-oraclelinux-9-3006-15: {extends: '.test_instance'}
-oraclelinux-8-3006-15: {extends: '.test_instance'}
-rockylinux-9-3006-15: {extends: '.test_instance'}
-rockylinux-8-3006-15: {extends: '.test_instance'}
-ubuntu-2404-3006-15: {extends: '.test_instance'}
-ubuntu-2204-3006-15: {extends: '.test_instance'}
-ubuntu-2004-3006-15: {extends: '.test_instance'}
+almalinux-9-3007: {extends: '.test_instance'}
+almalinux-8-3007: {extends: '.test_instance'}
+amazonlinux-2023-3007: {extends: '.test_instance'}
+amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
+centos-stream9-3007: {extends: '.test_instance'}
+debian-12-3007: {extends: '.test_instance'}
+debian-11-3007: {extends: '.test_instance'}
+fedora-41-3007: {extends: '.test_instance_failure_permitted'}
+fedora-40-3007: {extends: '.test_instance'}
+opensuse-leap-156-3007: {extends: '.test_instance'}
+opensuse-tmbl-latest-3007: {extends: '.test_instance'}
+oraclelinux-9-3007: {extends: '.test_instance'}
+oraclelinux-8-3007: {extends: '.test_instance'}
+rockylinux-9-3007: {extends: '.test_instance'}
+rockylinux-8-3007: {extends: '.test_instance'}
+ubuntu-2404-3007: {extends: '.test_instance'}
+ubuntu-2204-3007: {extends: '.test_instance'}
+ubuntu-2004-3007: {extends: '.test_instance'}
+almalinux-9-3006: {extends: '.test_instance'}
+almalinux-8-3006: {extends: '.test_instance'}
+amazonlinux-2023-3006: {extends: '.test_instance'}
+amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
+centos-stream9-3006: {extends: '.test_instance'}
+debian-12-3006: {extends: '.test_instance'}
+debian-11-3006: {extends: '.test_instance'}
+fedora-41-3006: {extends: '.test_instance_failure_permitted'}
+fedora-40-3006: {extends: '.test_instance'}
+opensuse-leap-156-3006: {extends: '.test_instance'}
+opensuse-tmbl-latest-3006: {extends: '.test_instance'}
+oraclelinux-9-3006: {extends: '.test_instance'}
+oraclelinux-8-3006: {extends: '.test_instance'}
+rockylinux-9-3006: {extends: '.test_instance'}
+rockylinux-8-3006: {extends: '.test_instance'}
+ubuntu-2404-3006: {extends: '.test_instance'}
+ubuntu-2204-3006: {extends: '.test_instance'}
+ubuntu-2004-3006: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################