feat(apt): add unattended suite

* saltstack-formulas/apt-formula#60
myii · Dec 18, 2019 · d579722 · d579722
1 parent 617e76c
commit d579722
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length
-            title: 'ci(gemfile): restrict `train` gem version until upstream fix [skip ci]'
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/110'
+            title: 'ci(travis): condense jobs by using a multi-suite job'
+            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/111'
             # yamllint enable rule:line-length
           github:
             owner: 'saltstack-formulas'
@@ -261,6 +261,12 @@ ssf:
           1:
             <<: *isk_suite_default
             name: 'preferences'
+          2:
+            <<: *isk_suite_default
+            name: 'unattended'
+          3:
+            <<: *isk_suite_default
+            name: ''
     apt-cacher: *formula_default
     bind: *formula_default
     cert: *formula_default

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -309,9 +309,23 @@ ssf:
               state_top:
                 - '*':
                     - .preferences
+          2:
+            inspec_yml:
+              summary: >-
+                Verify that the apt unattended preferences are configured correctly
+              supports: *supports_debian_ubuntu
+            provisioner:
+              pillars_from_files:
+                - .sls: 'test/salt/pillar/unattended.pillar.sls'
+              state_top:
+                - '*':
+                    - .unattended
+          3: {}
         inspec_suites_matrix:
           - repositories
           - preferences
+          - unattended
+          - ''
         platforms:
           # [os           , os_ver, salt_ver, py_ver]
           - [debian       ,  10   ,   master,      3]
@@ -325,14 +339,10 @@ ssf:
           # - [ubuntu       ,  16.04,   2017.7,      2]
         platforms_matrix:
           # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
-          - [debian       ,  10   ,   master,      3,    repositories]
-          # - [ubuntu       ,  18.04,   master,      3,    repositories]
-          - [debian       ,   9   ,   2019.2,      3,    repositories]
-          - [ubuntu       ,  18.04,   2019.2,      3,    repositories]
-          - [debian       ,  10   ,   master,      3,     preferences]
-          # - [ubuntu       ,  18.04,   master,      3,     preferences]
+          - [debian       ,  10   ,   master,      3,              '']
+          - [ubuntu       ,  18.04,   master,      3,    repositories]
           - [debian       ,   9   ,   2019.2,      3,     preferences]
-          - [ubuntu       ,  18.04,   2019.2,      3,     preferences]
+          - [ubuntu       ,  18.04,   2019.2,      3,      unattended]
         rubocop:
           Cops:
             Metrics/BlockLength: