ci: use latest test images

.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-41-master-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-40-master-1-py3: {extends: '.test_instance'}
+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'}

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:

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