feat(saltimages): update with latest changes from salt-image-builder

* https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/merge_requests/141
myii · Apr 11, 2022 · e13fc8f · e13fc8f
1 parent 75e7555
commit e13fc8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -64,8 +64,8 @@ ssf_node_anchors:
             upstream: 'upstream'
           commit:
             # yamllint disable rule:line-length rule:quoted-strings
-            title: "chore(gemfile.lock): update to latest gem versions (2022-W14) [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/427'
+            title: "ci(kitchen+gitlab): update for new pre-salted images [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/429'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -381,6 +381,7 @@ ssf:
     - [centos       , stream8,   tiamat,      3]  # cstr-08.0-tiamat-py3
     - [centos       ,    7   ,   tiamat,      3]  # cent-07.0-tiamat-py3
     # # Not available at the current time
+    # - [fedora       ,   36   ,   tiamat,      3]  # fedo-36.0-tiamat-py3
     # - [fedora       ,   35   ,   tiamat,      3]  # fedo-35.0-tiamat-py3
     # - [fedora       ,   34   ,   tiamat,      3]  # fedo-34.0-tiamat-py3
     # - [opensuse/leap,   15.3 ,   tiamat,      3]  # opsu-15.3-tiamat-py3
@@ -399,6 +400,7 @@ ssf:
     - [ubuntu       ,   18.04,   master,      3]  # ubun-18.0-master-py3
     - [centos       , stream8,   master,      3]  # cstr-08.0-master-py3
     - [centos       ,    7   ,   master,      3]  # cent-07.0-master-py3
+    - [fedora       ,   36   ,   master,      3]  # fedo-36.0-master-py3
     - [fedora       ,   35   ,   master,      3]  # fedo-35.0-master-py3
     - [fedora       ,   34   ,   master,      3]  # fedo-34.0-master-py3
     - [opensuse/leap,   15.3 ,   master,      3]  # opsu-15.3-master-py3
@@ -420,6 +422,7 @@ ssf:
     - [ubuntu       ,   18.04,   3004.1,      3]  # ubun-18.0-3004.1-py3
     - [centos       , stream8,   3004.1,      3]  # cstr-08.0-3004.1-py3
     - [centos       ,    7   ,   3004.1,      3]  # cent-07.0-3004.1-py3
+    - [fedora       ,   36   ,   3004.1,      3]  # fedo-36.0-3004.1-py3
     - [fedora       ,   35   ,   3004.1,      3]  # fedo-35.0-3004.1-py3
     - [fedora       ,   34   ,   3004.1,      3]  # fedo-34.0-3004.1-py3
     - [amazonlinux  ,    2   ,   3004.1,      3]  # amaz-02.0-3004.1-py3

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -4387,6 +4387,7 @@ ssf:
           - [centos       , stream8,   3004.1,      3,         default]
           - [centos       ,    7   ,   3003.4,      3,         default]
           # # `fedora` only installs `3004.X`
+          - [fedora       ,   36   ,   3004.1,      3,         default]
           - [fedora       ,   35   ,   3004.1,      3,         default]
           - [fedora       ,   34   ,   3004.1,      3,         default]
           # # `opensuse/*` only installs `3004.X`
@@ -5280,6 +5281,7 @@ ssf:
           - [rockylinux   ,    0   ,   master,      0,         default]
         platforms_matrix_allow_failure:
           - [debian       ,   11   ,   master,      3,         default]
+          - [fedora       ,   36   ,   master,      3,         default]
           - [fedora       ,   35   ,   master,      3,         default]
         # TODO: Upgrade to latest TOFS in a subsequent PR, since a legacy version
         # is active for the time being (needs to be checked for regressions)

diff --git a/ssf/libcimatrix.jinja b/ssf/libcimatrix.jinja
@@ -188,7 +188,7 @@
 {#-                 Was originally only using `platforms_matrix_allow_failure` for this but #}
 {#-                 now using with specific platforms on top until they stabilise #}
 {%-                 if ([os, os_ver, salt_ver, py_ver, suite_name] in platforms_matrix_allow_failure) or
-                       ([os, os_ver] in [['opensuse/tmbl', 'latest'], ['centos', 'stream8']])
+                       ([os, os_ver] in [['fedora', 36], ['opensuse/tmbl', 'latest'], ['centos', 'stream8']])
 %}
 {%-                   set test_template = ": {extends: '.test_instance_failure_permitted'}" %}
 {%-                 endif %}