From f76e21abbabc25415e38e5c079be7e8a49ea81cf Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Jun 2021 09:03:28 +0100 Subject: [PATCH 1/9] feat(saltimages): update with latest changes from `salt-image-builder` * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/merge_requests/106 --- ssf/defaults.yaml | 59 +++++++++++++++++++++++++++++++++-------------- ssf/formulas.yaml | 47 +++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 34 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 4d7d4e9c..538e1b03 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -332,6 +332,7 @@ ssf: ### Already available but not using across the Formulas' org until released # - [fedora , 35 , tiamat, 3] # fedo-35.0-tiamat-py3 - [fedora , 35 , master, 3] # fedo-35.0-master-py3 + # - [fedora , 35 , 3003.1, 3] # fedo-35.0-3003.1-py3 - [fedora , 35 , 3003.0, 3] # fedo-35.0-3003.0-py3 - [fedora , 35 , 3002.6, 3] # fedo-35.0-3002.6-py3 - [fedora , 35 , 3001.7, 3] # fedo-35.0-3001.7-py3 @@ -346,6 +347,7 @@ ssf: # # Not available at the current time # - [fedora , 34 , tiamat, 3] # fedo-34.0-tiamat-py3 # - [fedora , 33 , tiamat, 3] # fedo-33.0-tiamat-py3 + # - [opensuse/leap, 15.3 , tiamat, 3] # opsu-15.3-tiamat-py3 # - [opensuse/leap, 15.2 , tiamat, 3] # opsu-15.2-tiamat-py3 # - [opensuse/tmbl, latest, tiamat, 3] # opsu-tmbl-tiamat-py3 - [amazonlinux , 2 , tiamat, 3] # amaz-02.0-tiamat-py3 @@ -361,6 +363,7 @@ ssf: - [centos , 7 , master, 3] # cent-07.0-master-py3 - [fedora , 34 , master, 3] # fedo-34.0-master-py3 - [fedora , 33 , master, 3] # fedo-33.0-master-py3 + - [opensuse/leap, 15.3 , master, 3] # opsu-15.3-master-py3 - [opensuse/leap, 15.2 , master, 3] # opsu-15.2-master-py3 - [opensuse/tmbl, latest, master, 3] # opsu-tmbl-master-py3 - [amazonlinux , 2 , master, 3] # amaz-02.0-master-py3 @@ -370,21 +373,27 @@ ssf: - [gentoo/stage3, latest, master, 3] # gent-late-master-py3 - [gentoo/stage3, systemd, master, 3] # gent-sysd-master-py3 + ### `3003.1-py3` + - [debian , 10 , 3003.1, 3] # debi-10.0-3003.1-py3 + - [debian , 9 , 3003.1, 3] # debi-09.0-3003.1-py3 + - [ubuntu , 20.04, 3003.1, 3] # ubun-20.0-3003.1-py3 + - [ubuntu , 18.04, 3003.1, 3] # ubun-18.0-3003.1-py3 + - [centos , 8 , 3003.1, 3] # cent-08.0-3003.1-py3 + - [centos , 7 , 3003.1, 3] # cent-07.0-3003.1-py3 + # - [fedora , 34 , 3003.1, 3] # fedo-34.0-3003.1-py3 + # - [fedora , 33 , 3003.1, 3] # fedo-33.0-3003.1-py3 + - [opensuse/leap, 15.3 , 3003.1, 3] # opsu-15.3-3003.1-py3 + - [opensuse/leap, 15.2 , 3003.1, 3] # opsu-15.2-3003.1-py3 + - [opensuse/tmbl, latest, 3003.1, 3] # opsu-tmbl-3003.1-py3 + - [amazonlinux , 2 , 3003.1, 3] # amaz-02.0-3003.1-py3 + - [oraclelinux , 8 , 3003.1, 3] # orac-08.0-3003.1-py3 + - [oraclelinux , 7 , 3003.1, 3] # orac-07.0-3003.1-py3 + - [arch-base , latest, 3003.1, 3] # arch-late-3003.1-py3 + # - [gentoo/stage3, latest, 3003.1, 3] # gent-late-3003.1-py3 + # - [gentoo/stage3, systemd, 3003.1, 3] # gent-sysd-3003.1-py3 ### `3003.0-py3` - - [debian , 10 , 3003.0, 3] # debi-10.0-3003.0-py3 - - [debian , 9 , 3003.0, 3] # debi-09.0-3003.0-py3 - - [ubuntu , 20.04, 3003.0, 3] # ubun-20.0-3003.0-py3 - - [ubuntu , 18.04, 3003.0, 3] # ubun-18.0-3003.0-py3 - - [centos , 8 , 3003.0, 3] # cent-08.0-3003.0-py3 - - [centos , 7 , 3003.0, 3] # cent-07.0-3003.0-py3 - [fedora , 34 , 3003.0, 3] # fedo-34.0-3003.0-py3 - [fedora , 33 , 3003.0, 3] # fedo-33.0-3003.0-py3 - # - [opensuse/leap, 15.2 , 3003.0, 3] # opsu-15.2-3003.0-py3 - # - [opensuse/tmbl, latest, 3003.0, 3] # opsu-tmbl-3003.0-py3 - - [amazonlinux , 2 , 3003.0, 3] # amaz-02.0-3003.0-py3 - - [oraclelinux , 8 , 3003.0, 3] # orac-08.0-3003.0-py3 - - [oraclelinux , 7 , 3003.0, 3] # orac-07.0-3003.0-py3 - - [arch-base , latest, 3003.0, 3] # arch-late-3003.0-py3 - [gentoo/stage3, latest, 3003.0, 3] # gent-late-3003.0-py3 - [gentoo/stage3, systemd, 3003.0, 3] # gent-sysd-3003.0-py3 @@ -397,6 +406,7 @@ ssf: - [centos , 7 , 3002.6, 3] # cent-07.0-3002.6-py3 - [fedora , 34 , 3002.6, 3] # fedo-34.0-3002.6-py3 - [fedora , 33 , 3002.6, 3] # fedo-33.0-3002.6-py3 + # - [opensuse/leap, 15.3 , 3002.6, 3] # opsu-15.3-3002.6-py3 # - [opensuse/leap, 15.2 , 3002.6, 3] # opsu-15.2-3002.6-py3 # - [opensuse/tmbl, latest, 3002.6, 3] # opsu-tmbl-3002.6-py3 - [amazonlinux , 2 , 3002.6, 3] # amaz-02.0-3002.6-py3 @@ -409,6 +419,7 @@ ssf: - [gentoo/stage3, latest, 3002.5, 3] # gent-late-3002.5-py3 - [gentoo/stage3, systemd, 3002.5, 3] # gent-sysd-3002.5-py3 ### `3002.2-py3` + - [opensuse/leap, 15.3 , 3002.2, 3] # opsu-15.3-3002.2-py3 - [opensuse/leap, 15.2 , 3002.2, 3] # opsu-15.2-3002.2-py3 - [opensuse/tmbl, latest, 3002.2, 3] # opsu-tmbl-3002.2-py3 @@ -421,6 +432,7 @@ ssf: - [centos , 7 , 3001.7, 3] # cent-07.0-3001.7-py3 - [fedora , 34 , 3001.7, 3] # fedo-34.0-3001.7-py3 - [fedora , 33 , 3001.7, 3] # fedo-33.0-3001.7-py3 + - [opensuse/leap, 15.3 , 3001.7, 3] # opsu-15.3-3001.7-py3 - [opensuse/leap, 15.2 , 3001.7, 3] # opsu-15.2-3001.7-py3 - [opensuse/tmbl, latest, 3001.7, 3] # opsu-tmbl-3001.7-py3 - [amazonlinux , 2 , 3001.7, 3] # amaz-02.0-3001.7-py3 @@ -439,18 +451,16 @@ ssf: - [ubuntu , 18.04, 3000.9, 3] # ubun-18.0-3000.9-py3 - [centos , 8 , 3000.9, 3] # cent-08.0-3000.9-py3 - [centos , 7 , 3000.9, 3] # cent-07.0-3000.9-py3 + - [opensuse/leap, 15.3 , 3000.9, 3] # opsu-15.3-3000.9-py3 - [opensuse/leap, 15.2 , 3000.9, 3] # opsu-15.2-3000.9-py3 - [amazonlinux , 2 , 3000.9, 3] # amaz-02.0-3000.9-py3 - [oraclelinux , 8 , 3000.9, 3] # orac-08.0-3000.9-py3 - [oraclelinux , 7 , 3000.9, 3] # orac-07.0-3000.9-py3 - # - [gentoo/stage3, latest, 3000.9, 3] # gent-late-3000.9-py3 - # - [gentoo/stage3, systemd, 3000.9, 3] # gent-sysd-3000.9-py3 + - [gentoo/stage3, latest, 3000.9, 3] # gent-late-3000.9-py3 + - [gentoo/stage3, systemd, 3000.9, 3] # gent-sysd-3000.9-py3 ### `3000.9-py2` - [ubuntu , 18.04, 3000.9, 2] # ubun-18.0-3000.9-py2 - [arch-base , latest, 3000.9, 2] # arch-late-3000.9-py2 - ### `3000.8-py3` - - [gentoo/stage3, latest, 3000.8, 3] # gent-late-3000.8-py3 - - [gentoo/stage3, systemd, 3000.8, 3] # gent-sysd-3000.8-py3 saltimages_deprecated: ### Deprecated, no longer being built but still available in Docker Hub @@ -463,7 +473,20 @@ ssf: - [fedora , 31 , master, 3] # fedo-31.0-master-py3 ### `3003.0-py3` + - [debian , 10 , 3003.0, 3] # debi-10.0-3003.0-py3 + - [debian , 9 , 3003.0, 3] # debi-09.0-3003.0-py3 + - [ubuntu , 20.04, 3003.0, 3] # ubun-20.0-3003.0-py3 + - [ubuntu , 18.04, 3003.0, 3] # ubun-18.0-3003.0-py3 + - [centos , 8 , 3003.0, 3] # cent-08.0-3003.0-py3 + - [centos , 7 , 3003.0, 3] # cent-07.0-3003.0-py3 - [fedora , 32 , 3003.0, 3] # fedo-32.0-3003.0-py3 + # - [opensuse/leap, 15.3 , 3003.0, 3] # opsu-15.3-3003.0-py3 + # - [opensuse/leap, 15.2 , 3003.0, 3] # opsu-15.2-3003.0-py3 + # - [opensuse/tmbl, latest, 3003.0, 3] # opsu-tmbl-3003.0-py3 + - [amazonlinux , 2 , 3003.0, 3] # amaz-02.0-3003.0-py3 + - [oraclelinux , 8 , 3003.0, 3] # orac-08.0-3003.0-py3 + - [oraclelinux , 7 , 3003.0, 3] # orac-07.0-3003.0-py3 + - [arch-base , latest, 3003.0, 3] # arch-late-3003.0-py3 ### `3002.6-py3` - [ubuntu , 16.04, 3002.6, 3] # ubun-16.0-3002.6-py3 @@ -651,6 +674,8 @@ ssf: - [amazonlinux , 2 , 3000.8, 3] # amaz-02.0-3000.8-py3 - [oraclelinux , 8 , 3000.8, 3] # orac-08.0-3000.8-py3 - [oraclelinux , 7 , 3000.8, 3] # orac-07.0-3000.8-py3 + - [gentoo/stage3, latest, 3000.8, 3] # gent-late-3000.8-py3 + - [gentoo/stage3, systemd, 3000.8, 3] # gent-sysd-3000.8-py3 ### `3000.8-py2` - [ubuntu , 18.04, 3000.8, 2] # ubun-18.0-3000.8-py2 - [ubuntu , 16.04, 3000.8, 2] # ubun-16.0-3000.8-py2 diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 7b25acc6..1e46d420 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -3671,7 +3671,7 @@ ssf: - [opensuse/tmbl, 0 , master, 0, suse] - [amazonlinux , 0 , master, 0, amazonlinux] - [oraclelinux , 0 , master, 0, redhat] - # # - [arch-base , 0 , 3003.0, 0, default] + # # - [arch-base , 0 , master, 0, default] # Gentoo (OpenRC): Service `proftpd' needs non existent service `net' # # - [gentoo/stage3, 0 , master, 0, default] - [gentoo/stage3, systemd, master, 0, gentoo] @@ -3941,6 +3941,7 @@ ssf: 0: includes: # [os , os_ver, salt_ver, py_ver] + - [0 , 0 , 3003.1, 3] - [0 , 0 , 3003.0, 3] - [windows , 0 , latest, 3] inspec_yml: @@ -4034,22 +4035,28 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] ### `v3003-py3` - - [debian , 10 , 3003.0, 3, v3003-py3] - # - [debian , 9 , 3003.0, 3, v3003-py3] - - [ubuntu , 20.04, 3003.0, 3, v3003-py3] - # - [ubuntu , 18.04, 3003.0, 3, v3003-py3] - - [centos , 8 , 3003.0, 3, v3003-py3] - # - [centos , 7 , 3003.0, 3, v3003-py3] + - [debian , 10 , 3003.1, 3, v3003-py3] + # - [debian , 9 , 3003.1, 3, v3003-py3] + - [ubuntu , 20.04, 3003.1, 3, v3003-py3] + # - [ubuntu , 18.04, 3003.1, 3, v3003-py3] + - [centos , 8 , 3003.1, 3, v3003-py3] + # - [centos , 7 , 3003.1, 3, v3003-py3] # # Unavailable below since only installs `3003.X` + # # TODO: Fix when `3003.1` released + # - [fedora , 34 , 3003.1, 3, v3003-py3] + # - [fedora , 33 , 3003.1, 3, v3003-py3] - [fedora , 34 , 3003.0, 3, v3003-py3] - [fedora , 33 , 3003.0, 3, v3003-py3] - # # TODO: Fix when `3003.0` released - # # - [opensuse/leap, 15.2 , 3003.0, 3, v3003-py3] - # # - [opensuse/tmbl, latest, 3003.0, 3, v3003-py3] - - [amazonlinux , 2 , 3003.0, 3, v3003-py3] - - [oraclelinux , 8 , 3003.0, 3, v3003-py3] - # - [oraclelinux , 7 , 3003.0, 3, v3003-py3] - - [arch-base , latest, 3003.0, 3, v3003-py3] + # # TODO: Fix when `3003.1` released; however, see the note below about + # # using either `15.3` or `15.2` due to a shared `_mapdata` + # # verification file within the same InSpec suite + # # - [opensuse/leap, 15.3 , 3003.1, 3, v3003-py3] + # # - [opensuse/leap, 15.2 , 3003.1, 3, v3003-py3] + # # - [opensuse/tmbl, latest, 3003.1, 3, v3003-py3] + - [amazonlinux , 2 , 3003.1, 3, v3003-py3] + - [oraclelinux , 8 , 3003.1, 3, v3003-py3] + # - [oraclelinux , 7 , 3003.1, 3, v3003-py3] + - [arch-base , latest, 3003.1, 3, v3003-py3] - [gentoo/stage3, latest, 3003.0, 3, v3003-py3] - [gentoo/stage3, systemd, 3003.0, 3, v3003-py3] - [windows , 0 , latest, 3, v3003-py3] @@ -4062,6 +4069,10 @@ ssf: # - [centos , 8 , 3002.6, 3, v3002-py3] - [centos , 7 , 3002.6, 3, v3002-py3] # # Note, `3002.2` is the last in this series for openSUSE + # # Furthermore, can't use both `15.3` & `15.2` together within the same + # # InSpec suite when there's a shared `_mapdata` verification file -- + # # using the currently supported version for now (re: Salt repo) + # - [opensuse/leap, 15.3 , 3002.2, 3, v3002-py3] - [opensuse/leap, 15.2 , 3002.2, 3, v3002-py3] - [opensuse/tmbl, latest, 3002.2, 3, v3002-py3] - [amazonlinux , 2 , 3002.6, 3, v3002-py3] @@ -4082,14 +4093,15 @@ ssf: - [centos , 8 , 3001.7, 3, v3001-py3] # - [centos , 7 , 3001.7, 3, v3001-py3] # # Installs `3002.X` + # # - [opensuse/leap, 15.3 , 3001.7, 3, v3001-py3] # # - [opensuse/leap, 15.2 , 3001.7, 3, v3001-py3] # # - [opensuse/tmbl, latest, 3001.7, 3, v3001-py3] # - [amazonlinux , 2 , 3001.7, 3, v3001-py3] - [oraclelinux , 8 , 3001.7, 3, v3001-py3] # - [oraclelinux , 7 , 3001.7, 3, v3001-py3] # # - [arch-base , latest, 3001.7, 3, v3001-py3] - # - [gentoo/stage3, latest, 3001.7, 3, v3001-py3] - # - [gentoo/stage3, systemd, 3001.7, 3, v3001-py3] + # - [gentoo/stage3, latest, 3001.6, 3, v3001-py3] + # - [gentoo/stage3, systemd, 3001.6, 3, v3001-py3] - [openbsd , 0 , 3001.1, 3, v3001-py3] ### `v3000-py3` @@ -4099,6 +4111,7 @@ ssf: # - [centos , 8 , 3000.9, 3, v3000-py3] - [centos , 7 , 3000.9, 3, v3000-py3] # # Installs `3002.X` + # # - [opensuse/leap, 15.3 , 3000.9, 3, v3000-py3] # # - [opensuse/leap, 15.2 , 3000.9, 3, v3000-py3] # - [amazonlinux , 2 , 3000.9, 3, v3000-py3] # - [oraclelinux , 8 , 3000.9, 3, v3000-py3] @@ -4118,7 +4131,7 @@ ssf: github: platforms: provisioner: - salt_bootstrap_options: '-pythonVersion 3 -version 3003' + salt_bootstrap_options: '-pythonVersion 3 -version 3003.1' winrepo_ng: ['salt-minion-py3'] use_tofs: true yamllint: From f00ec522262097652f6778b90f4aa14dc939d0c0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 25 Jun 2021 00:11:27 +0100 Subject: [PATCH 2/9] feat(saltimages): update with latest changes from `salt-image-builder` * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/merge_requests/107 --- ssf/defaults.yaml | 56 +++--- .../default/test/integration/share/inspec.yml | 2 + .../integration/share/libraries/system.rb | 2 +- ssf/formulas.yaml | 164 +++++++++++++++--- 4 files changed, 182 insertions(+), 42 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 538e1b03..9d30860b 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -117,6 +117,8 @@ ssf_node_anchors: - oracle - arch - gentoo + - almalinux + - rocky - windows provisioner: dependencies: [] @@ -163,6 +165,8 @@ ssf_node_anchors: # - [oraclelinux , 0 , master, 0, default] # - [arch-base , 0 , master, 0, default] # - [gentoo/stage3, 0 , master, 0, default] + # - [almalinux , 0 , master, 0, default] + # - [rockylinux , 0 , master, 0, default] # To deal with excessive instances when mimicking `kitchen list -b` # If values are set, only use these as commented entries in the matrix platforms_matrix_commented_includes: [] @@ -332,7 +336,7 @@ ssf: ### Already available but not using across the Formulas' org until released # - [fedora , 35 , tiamat, 3] # fedo-35.0-tiamat-py3 - [fedora , 35 , master, 3] # fedo-35.0-master-py3 - # - [fedora , 35 , 3003.1, 3] # fedo-35.0-3003.1-py3 + - [fedora , 35 , 3003.1, 3] # fedo-35.0-3003.1-py3 - [fedora , 35 , 3003.0, 3] # fedo-35.0-3003.0-py3 - [fedora , 35 , 3002.6, 3] # fedo-35.0-3002.6-py3 - [fedora , 35 , 3001.7, 3] # fedo-35.0-3001.7-py3 @@ -353,6 +357,8 @@ ssf: - [amazonlinux , 2 , tiamat, 3] # amaz-02.0-tiamat-py3 - [oraclelinux , 8 , tiamat, 3] # orac-08.0-tiamat-py3 - [oraclelinux , 7 , tiamat, 3] # orac-07.0-tiamat-py3 + - [almalinux , 8 , tiamat, 3] # alma-08.0-tiamat-py3 + - [rockylinux , 8 , tiamat, 3] # rock-08.0-tiamat-py3 ### `master-py3` - [debian , 10 , master, 3] # debi-10.0-master-py3 @@ -372,6 +378,8 @@ ssf: - [arch-base , latest, master, 3] # arch-late-master-py3 - [gentoo/stage3, latest, master, 3] # gent-late-master-py3 - [gentoo/stage3, systemd, master, 3] # gent-sysd-master-py3 + - [almalinux , 8 , master, 3] # alma-08.0-master-py3 + - [rockylinux , 8 , master, 3] # rock-08.0-master-py3 ### `3003.1-py3` - [debian , 10 , 3003.1, 3] # debi-10.0-3003.1-py3 @@ -380,8 +388,8 @@ ssf: - [ubuntu , 18.04, 3003.1, 3] # ubun-18.0-3003.1-py3 - [centos , 8 , 3003.1, 3] # cent-08.0-3003.1-py3 - [centos , 7 , 3003.1, 3] # cent-07.0-3003.1-py3 - # - [fedora , 34 , 3003.1, 3] # fedo-34.0-3003.1-py3 - # - [fedora , 33 , 3003.1, 3] # fedo-33.0-3003.1-py3 + - [fedora , 34 , 3003.1, 3] # fedo-34.0-3003.1-py3 + - [fedora , 33 , 3003.1, 3] # fedo-33.0-3003.1-py3 - [opensuse/leap, 15.3 , 3003.1, 3] # opsu-15.3-3003.1-py3 - [opensuse/leap, 15.2 , 3003.1, 3] # opsu-15.2-3003.1-py3 - [opensuse/tmbl, latest, 3003.1, 3] # opsu-tmbl-3003.1-py3 @@ -389,13 +397,8 @@ ssf: - [oraclelinux , 8 , 3003.1, 3] # orac-08.0-3003.1-py3 - [oraclelinux , 7 , 3003.1, 3] # orac-07.0-3003.1-py3 - [arch-base , latest, 3003.1, 3] # arch-late-3003.1-py3 - # - [gentoo/stage3, latest, 3003.1, 3] # gent-late-3003.1-py3 - # - [gentoo/stage3, systemd, 3003.1, 3] # gent-sysd-3003.1-py3 - ### `3003.0-py3` - - [fedora , 34 , 3003.0, 3] # fedo-34.0-3003.0-py3 - - [fedora , 33 , 3003.0, 3] # fedo-33.0-3003.0-py3 - - [gentoo/stage3, latest, 3003.0, 3] # gent-late-3003.0-py3 - - [gentoo/stage3, systemd, 3003.0, 3] # gent-sysd-3003.0-py3 + - [gentoo/stage3, latest, 3003.1, 3] # gent-late-3003.1-py3 + - [gentoo/stage3, systemd, 3003.1, 3] # gent-sysd-3003.1-py3 ### `3002.6-py3` - [debian , 10 , 3002.6, 3] # debi-10.0-3002.6-py3 @@ -413,11 +416,8 @@ ssf: - [oraclelinux , 8 , 3002.6, 3] # orac-08.0-3002.6-py3 - [oraclelinux , 7 , 3002.6, 3] # orac-07.0-3002.6-py3 - [arch-base , latest, 3002.6, 3] # arch-late-3002.6-py3 - # - [gentoo/stage3, latest, 3002.6, 3] # gent-late-3002.6-py3 - # - [gentoo/stage3, systemd, 3002.6, 3] # gent-sysd-3002.6-py3 - ### `3002.5-py3` - - [gentoo/stage3, latest, 3002.5, 3] # gent-late-3002.5-py3 - - [gentoo/stage3, systemd, 3002.5, 3] # gent-sysd-3002.5-py3 + - [gentoo/stage3, latest, 3002.6, 3] # gent-late-3002.6-py3 + - [gentoo/stage3, systemd, 3002.6, 3] # gent-sysd-3002.6-py3 ### `3002.2-py3` - [opensuse/leap, 15.3 , 3002.2, 3] # opsu-15.3-3002.2-py3 - [opensuse/leap, 15.2 , 3002.2, 3] # opsu-15.2-3002.2-py3 @@ -439,11 +439,8 @@ ssf: - [oraclelinux , 8 , 3001.7, 3] # orac-08.0-3001.7-py3 - [oraclelinux , 7 , 3001.7, 3] # orac-07.0-3001.7-py3 - [arch-base , latest, 3001.7, 3] # arch-late-3001.7-py3 - # - [gentoo/stage3, latest, 3001.7, 3] # gent-late-3001.7-py3 - # - [gentoo/stage3, systemd, 3001.7, 3] # gent-sysd-3001.7-py3 - ### `3001.6-py3` - - [gentoo/stage3, latest, 3001.6, 3] # gent-late-3001.6-py3 - - [gentoo/stage3, systemd, 3001.6, 3] # gent-sysd-3001.6-py3 + - [gentoo/stage3, latest, 3001.7, 3] # gent-late-3001.7-py3 + - [gentoo/stage3, systemd, 3001.7, 3] # gent-sysd-3001.7-py3 ### `3000.9-py3` - [debian , 10 , 3000.9, 3] # debi-10.0-3000.9-py3 @@ -462,6 +459,25 @@ ssf: - [ubuntu , 18.04, 3000.9, 2] # ubun-18.0-3000.9-py2 - [arch-base , latest, 3000.9, 2] # arch-late-3000.9-py2 + saltimages_deprecated_stable_by_git: + ### These aren't deprecated per se, since they are the latest `stable` images + ### available; however, a latest version `git`-based image is available so using + ### that instead to avoid numerous inconsistencies across the org + ### Both issues from this formula and in the rendered files such as `kitchen.yml` + ### `3003.0-py3` + - [fedora , 34 , 3003.0, 3] # fedo-34.0-3003.0-py3 + - [fedora , 33 , 3003.0, 3] # fedo-33.0-3003.0-py3 + - [gentoo/stage3, latest, 3003.0, 3] # gent-late-3003.0-py3 + - [gentoo/stage3, systemd, 3003.0, 3] # gent-sysd-3003.0-py3 + + ### `3002.5-py3` + - [gentoo/stage3, latest, 3002.5, 3] # gent-late-3002.5-py3 + - [gentoo/stage3, systemd, 3002.5, 3] # gent-sysd-3002.5-py3 + + ### `3001.6-py3` + - [gentoo/stage3, latest, 3001.6, 3] # gent-late-3001.6-py3 + - [gentoo/stage3, systemd, 3001.6, 3] # gent-sysd-3001.6-py3 + saltimages_deprecated: ### Deprecated, no longer being built but still available in Docker Hub ### `tiamat-py3` diff --git a/ssf/files/default/test/integration/share/inspec.yml b/ssf/files/default/test/integration/share/inspec.yml index cf623a19..ee200809 100644 --- a/ssf/files/default/test/integration/share/inspec.yml +++ b/ssf/files/default/test/integration/share/inspec.yml @@ -19,4 +19,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/ssf/files/default/test/integration/share/libraries/system.rb b/ssf/files/default/test/integration/share/libraries/system.rb index 461dea4b..87daf086 100644 --- a/ssf/files/default/test/integration/share/libraries/system.rb +++ b/ssf/files/default/test/integration/share/libraries/system.rb @@ -36,7 +36,7 @@ def build_platform_family def build_platform_name case inspec.platform[:name] - when 'amazon', 'oracle' + when 'amazon', 'oracle', 'rocky' "#{inspec.platform[:name]}linux" when /^windows_/ inspec.platform[:family] diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 1e46d420..fe8987a6 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -17,16 +17,20 @@ ssf_node_anchors: - debian - ubuntu # yamllint disable-line rule:line-length - supports_debian_ubuntu_centos_fedora_opensuse: &supports_debian_ubuntu_centos_fedora_opensuse + supports_debian_ubuntu_centos_fedora_opensuse_alma_rocky: &supports_debian_ubuntu_centos_fedora_opensuse_alma_rocky - debian - ubuntu - centos - fedora - opensuse - supports_centos_amazon_oracle: &supports_centos_amazon_oracle + - almalinux + - rocky + supports_redhat_except_fedora: &supports_redhat_except_fedora - centos - amazon - oracle + - almalinux + - rocky supports_windows_only: &supports_windows_only - windows provisioner: @@ -65,6 +69,8 @@ ssf_node_anchors: - [fedora , 0 , 0 , 0] - [amazonlinux , 0 , 0 , 0] - [oraclelinux , 0 , 0 , 0] + - [almalinux , 0 , 0 , 0] + - [rockylinux , 0 , 0 , 0] # yamllint disable-line rule:line-length platforms_osfamily_redhat_without_fedora: &platforms_osfamily_redhat_without_fedora # [os , os_ver, salt_ver, py_ver] @@ -72,6 +78,8 @@ ssf_node_anchors: # # - [fedora , 0 , 0 , 0] - [amazonlinux , 0 , 0 , 0] - [oraclelinux , 0 , 0 , 0] + - [almalinux , 0 , 0 , 0] + - [rockylinux , 0 , 0 , 0] # yamllint disable-line rule:line-length platforms_osfamily_redhat_without_amazon: &platforms_osfamily_redhat_without_amazon # [os , os_ver, salt_ver, py_ver] @@ -79,6 +87,8 @@ ssf_node_anchors: - [fedora , 0 , 0 , 0] # # - [amazonlinux , 0 , 0 , 0] - [oraclelinux , 0 , 0 , 0] + - [almalinux , 0 , 0 , 0] + - [rockylinux , 0 , 0 , 0] platforms_osfamily_suse: &platforms_osfamily_suse # [os , os_ver, salt_ver, py_ver] - [opensuse/leap, 0 , 0 , 0] @@ -106,6 +116,8 @@ ssf_node_anchors: - [amazonlinux , 0 , 0 , 0] # # - [oraclelinux , 0 , 0 , 0] - [oraclelinux , 8 , 0 , 0] + - [almalinux , 0 , 0 , 0] + - [rockylinux , 0 , 0 , 0] platforms_os_gentoo: &platforms_os_gentoo # [os , os_ver, salt_ver, py_ver] - [gentoo/stage3, 0 , 0 , 0] @@ -126,6 +138,8 @@ ssf_node_anchors: # # - [fedora , 0 , master, 0, default] - [amazonlinux , 0 , master, 0, default] - [oraclelinux , 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] # yamllint disable-line rule:line-length platforms_matrix_without_arch_and_gentoo: &platforms_matrix_without_arch_and_gentoo # [os , os_ver, salt_ver, py_ver, inspec_suite] @@ -139,6 +153,8 @@ ssf_node_anchors: - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] # yamllint disable-line rule:line-length platforms_matrix_without_arch_and_tumbleweed: &platforms_matrix_without_arch_and_tumbleweed # [os , os_ver, salt_ver, py_ver, inspec_suite] @@ -152,6 +168,8 @@ ssf_node_anchors: - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] platforms_matrix_without_gentoo: &platforms_matrix_without_gentoo # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 0 , master, 0, default] @@ -164,6 +182,8 @@ ssf_node_anchors: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] # yamllint disable-line rule:line-length platforms_matrix_without_gentoo_non_systemd: &platforms_matrix_without_gentoo_non_systemd # [os , os_ver, salt_ver, py_ver, inspec_suite] @@ -177,8 +197,10 @@ ssf_node_anchors: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, systemd, master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] # yamllint disable-line rule:line-length - platforms_matrix_without_centos_and_oracle: &platforms_matrix_without_centos_and_oracle + platforms_matrix_without_centos_oracle_alma_and_rocky: &platforms_matrix_without_centos_oracle_alma_and_rocky # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 0 , master, 0, default] - [ubuntu , 0 , master, 0, default] @@ -190,6 +212,8 @@ ssf_node_anchors: # # - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] platforms_matrix_without_rhel8: &platforms_matrix_without_rhel8 # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 0 , master, 0, default] @@ -204,6 +228,8 @@ ssf_node_anchors: - [oraclelinux , 7 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] # yamllint disable-line rule:line-length platforms_matrix_without_rhel8_and_gentoo: &platforms_matrix_without_rhel8_and_gentoo # [os , os_ver, salt_ver, py_ver, inspec_suite] @@ -219,6 +245,8 @@ ssf_node_anchors: - [oraclelinux , 7 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] platforms_matrix_jetbrains: &platforms_matrix_jetbrains # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 0 , master, 0, default] @@ -233,6 +261,8 @@ ssf_node_anchors: - [oraclelinux , 7 , master, 0, default] - [arch-base , 0 , master, 0, arch] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] # yamllint disable-line rule:line-length travis_do_not_use_single_job_for_linters: &travis_do_not_use_single_job_for_linters use_single_job_for_linters: false @@ -423,6 +453,8 @@ ssf: - [oraclelinux , 7 , master, 0, ''] # modules - [arch-base , 0 , master, 0, modules] # POSSIBLE # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, ''] # modules + - [rockylinux , 0 , master, 0, ''] # modules - [freebsd , 0 , master, 3, ''] testing_freebsd: active: true @@ -570,6 +602,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] travis: *travis_do_not_use_single_job_for_linters yamllint: rules: @@ -618,7 +652,7 @@ ssf: map_jinja: verification: import: ['chrony'] - platforms_matrix: *platforms_matrix_without_centos_and_oracle + platforms_matrix: *platforms_matrix_without_centos_oracle_alma_and_rocky use_tofs: true semrel_files: *semrel_files_default collectd: @@ -650,6 +684,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] semrel_files: *semrel_files_default consul: context: @@ -728,6 +764,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] use_tofs: true semrel_files: *semrel_files_default devstack: @@ -799,6 +837,8 @@ ssf: - [oraclelinux , 7 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] semrel_files: *semrel_files_inc_map_jinja_verifier django: context: @@ -831,6 +871,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] semrel_files: *semrel_files_default docker: context: @@ -903,6 +945,8 @@ ssf: # # - [gentoo/stage3, 0 , master, 0, default] - [gentoo/stage3, systemd, master, 0, archive] - [gentoo/stage3, systemd, master, 0, clean] + - [almalinux , 0 , master, 0, ''] + - [rockylinux , 0 , master, 0, ''] use_tofs: true yamllint: ignore: @@ -970,7 +1014,7 @@ ssf: inspec_yml: summary: >- Verify that the epel formula is setup and configured correctly - supports: *supports_centos_amazon_oracle + supports: *supports_redhat_except_fedora provisioner: pillars_from_files: - .sls: 'test/salt/pillar/default.sls' @@ -1055,6 +1099,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] semrel_files: *semrel_files_inc_map_jinja_verifier golang: context: @@ -1100,6 +1146,8 @@ ssf: - [oraclelinux , 0 , master, 0, ''] - [arch-base , 0 , master, 0, ''] # # - [gentoo/stage3, 0 , master, 0, ''] + - [almalinux , 0 , master, 0, ''] + - [rockylinux , 0 , master, 0, ''] - [freebsd , 0 , master, 3, ''] - [openbsd , 0 , 0 , 3, package] - [windows , 0 , latest, 3, ''] @@ -1226,6 +1274,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] use_github_actions: true yamllint: ignore: @@ -1303,6 +1353,8 @@ ssf: - [oraclelinux , 7 , master, 0, ''] - [arch-base , 0 , master, 0, ''] - [gentoo/stage3, 0 , master, 0, ''] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] yamllint: rules: key-duplicates: @@ -1803,6 +1855,8 @@ ssf: - [oraclelinux , 7 , master, 0, default] - [arch-base , 0 , master, 0, arch] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] use_tofs: true yamllint: ignore: @@ -2343,6 +2397,8 @@ ssf: - [oraclelinux , 8 , master, 0, rpm] - [arch-base , 0 , master, 0, git] - [gentoo/stage3, 0 , master, 0, git] + - [almalinux , 0 , master, 0, rpm] + - [rockylinux , 0 , master, 0, rpm] semrel_files: *semrel_files_default libvirt: context: @@ -2358,7 +2414,7 @@ ssf: inspec_yml: summary: >- Verify that the libvirt formula is setup and configured correctly - supports: *supports_debian_ubuntu_centos_fedora_opensuse + supports: *supports_debian_ubuntu_centos_fedora_opensuse_alma_rocky 1: includes: # [os , os_ver, salt_ver, py_ver] @@ -2366,7 +2422,7 @@ ssf: inspec_yml: summary: >- Verify that the libvirt formula can cleanup correctly - supports: *supports_debian_ubuntu_centos_fedora_opensuse + supports: *supports_debian_ubuntu_centos_fedora_opensuse_alma_rocky provisioner: state_top: - '*': @@ -2395,6 +2451,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] use_libsaltcli: true use_tofs: true semrel_files: *semrel_files_default @@ -2446,6 +2504,8 @@ ssf: # # - [oraclelinux , 7 , master, 0, redhat] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, redhat] + - [rockylinux , 0 , master, 0, redhat] semrel_files: *semrel_files_default logrotate: context: @@ -2563,6 +2623,8 @@ ssf: - [oraclelinux , 0 , master, 0, ''] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, ''] + - [rockylinux , 0 , master, 0, ''] use_tofs: true semrel_files: *semrel_files_default maven: @@ -2649,6 +2711,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] use_tofs: true yamllint: ignore: @@ -2711,6 +2775,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] - [freebsd , 0 , master, 3, default] - [openbsd , 0 , 0 , 3, default] testing_freebsd: @@ -2757,6 +2823,8 @@ ssf: - [ubuntu , 18.04, 0 , 0] - [centos , 0 , 0 , 0] - [oraclelinux , 8 , 0 , 0] + - [almalinux , 0 , 0 , 0] + - [rockylinux , 0 , 0 , 0] inspec_yml: summary: >- Verify that the nginx formula is setup and configured correctly @@ -2790,6 +2858,8 @@ ssf: - [oraclelinux , 7 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, systemd, master, 0, default] + - [almalinux , 0 , master, 0, ''] + - [rockylinux , 0 , master, 0, ''] - [freebsd , 0 , master, 3, default] testing_freebsd: active: true @@ -2828,6 +2898,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] use_tofs: true semrel_files: *semrel_files_default node: @@ -2886,6 +2958,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] # Use this to start adopting the latest `platforms_matrix` use_tofs: true yamllint: @@ -2970,6 +3044,8 @@ ssf: - [arch-base , 0 , master, 0, ''] - [gentoo/stage3, latest, master, 3, mode-eq-none] - [gentoo/stage3, systemd, master, 0, ''] + - [almalinux , 0 , master, 0, ''] + - [rockylinux , 0 , master, 0, ''] use_tofs: true yamllint: ignore: @@ -3018,6 +3094,8 @@ ssf: # https://wiki.archlinux.org/index.php/OpenLDAP # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] semrel_files: *semrel_files_default openntpd: context: @@ -3051,6 +3129,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] semrel_files: *semrel_files_inc_map_jinja_verifier openssh: context: @@ -3088,6 +3168,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] - [freebsd , 0 , master, 3, default] - [openbsd , 0 , 0 , 3, default] testing_freebsd: @@ -3141,6 +3223,8 @@ ssf: - [oraclelinux , 7 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] # # TODO: Fix 2 failing states in order to enable this # # - [freebsd , 0 , master, 3, default] - [windows , 0 , latest, 3, default] @@ -3218,6 +3302,8 @@ ssf: # Some of `*platforms_os_centos` + `oraclelinux-8` - [centos , 8 , 0 , 0] - [oraclelinux , 8 , 0 , 0] + - [almalinux , 0 , 0 , 0] + - [rockylinux , 0 , 0 , 0] provisioner: dependencies: *dependencies_epel pillars_from_files: @@ -3331,6 +3417,8 @@ ssf: - [oraclelinux , 7 , master, 0, centos] - [arch-base , 0 , master, 0, arch] - [gentoo/stage3, 0 , master, 0, gentoo] + - [almalinux , 0 , master, 0, redhat8] + - [rockylinux , 0 , master, 0, redhat8] - [windows , 0 , latest, 3, windows] testing_windows: active: true @@ -3433,6 +3521,8 @@ ssf: - [oraclelinux , 0 , master, 0, redhat] # # - [arch-base , 0 , master, 0, arch] # # - [gentoo/stage3, 0 , master, 0, gentoo] + - [almalinux , 0 , master, 0, redhat] + - [rockylinux , 0 , master, 0, redhat] - [freebsd , 0 , master, 3, freebsd] testing_freebsd: active: true @@ -3505,6 +3595,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] - [freebsd , 0 , master, 3, default] # # - [openbsd , 0 , 0 , 3, default] # # - [windows , 0 , latest, 3, default] @@ -3564,6 +3656,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] yamllint: ignore: additional: @@ -3675,6 +3769,8 @@ ssf: # Gentoo (OpenRC): Service `proftpd' needs non existent service `net' # # - [gentoo/stage3, 0 , master, 0, default] - [gentoo/stage3, systemd, master, 0, gentoo] + - [almalinux , 0 , master, 0, redhat] + - [rockylinux , 0 , master, 0, redhat] yamllint: ignore: additional: @@ -3729,6 +3825,8 @@ ssf: # - [oraclelinux , 7 , master, 0, ''] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, ''] + - [rockylinux , 0 , master, 0, ''] use_tofs: true yamllint: ignore: @@ -3771,6 +3869,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] use_libsaltcli: true use_tofs: true semrel_files: *semrel_files_inc_map_jinja_verifier @@ -3847,6 +3947,8 @@ ssf: - [oraclelinux , 0 , master, 0, redhat] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, redhat] + - [rockylinux , 0 , master, 0, redhat] travis: *travis_do_not_use_single_job_for_linters use_tofs: true semrel_files: *semrel_files_default @@ -3910,6 +4012,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] yamllint: ignore: additional: @@ -3942,7 +4046,6 @@ ssf: includes: # [os , os_ver, salt_ver, py_ver] - [0 , 0 , 3003.1, 3] - - [0 , 0 , 3003.0, 3] - [windows , 0 , latest, 3] inspec_yml: summary: >- @@ -3960,7 +4063,6 @@ ssf: includes: # [os , os_ver, salt_ver, py_ver] - [0 , 0 , 3002.6, 3] - - [0 , 0 , 3002.5, 3] - [0 , 0 , 3002.2, 3] inspec_yml: summary: >- @@ -4042,11 +4144,8 @@ ssf: - [centos , 8 , 3003.1, 3, v3003-py3] # - [centos , 7 , 3003.1, 3, v3003-py3] # # Unavailable below since only installs `3003.X` - # # TODO: Fix when `3003.1` released - # - [fedora , 34 , 3003.1, 3, v3003-py3] - # - [fedora , 33 , 3003.1, 3, v3003-py3] - - [fedora , 34 , 3003.0, 3, v3003-py3] - - [fedora , 33 , 3003.0, 3, v3003-py3] + - [fedora , 34 , 3003.1, 3, v3003-py3] + - [fedora , 33 , 3003.1, 3, v3003-py3] # # TODO: Fix when `3003.1` released; however, see the note below about # # using either `15.3` or `15.2` due to a shared `_mapdata` # # verification file within the same InSpec suite @@ -4057,8 +4156,12 @@ ssf: - [oraclelinux , 8 , 3003.1, 3, v3003-py3] # - [oraclelinux , 7 , 3003.1, 3, v3003-py3] - [arch-base , latest, 3003.1, 3, v3003-py3] - - [gentoo/stage3, latest, 3003.0, 3, v3003-py3] - - [gentoo/stage3, systemd, 3003.0, 3, v3003-py3] + - [gentoo/stage3, latest, 3003.1, 3, v3003-py3] + - [gentoo/stage3, systemd, 3003.1, 3, v3003-py3] + # # TODO: When supported in an official release, move these two platforms + # # to that release (as a minimum, no other Salt versions) + - [almalinux , 0 , 3003.1, 3, v3003-py3] + - [rockylinux , 0 , 3003.1, 3, v3003-py3] - [windows , 0 , latest, 3, v3003-py3] ### `v3002-py3` @@ -4079,9 +4182,8 @@ ssf: # - [oraclelinux , 8 , 3002.6, 3, v3002-py3] - [oraclelinux , 7 , 3002.6, 3, v3002-py3] # # - [arch-base , latest, 3002.6, 3, v3002-py3] - # # Note, `3002.6` hasn't been released yet for Gentoo - # - [gentoo/stage3, latest, 3002.5, 3, v3002-py3] - # - [gentoo/stage3, systemd, 3002.5, 3, v3002-py3] + # - [gentoo/stage3, latest, 3002.6, 3, v3002-py3] + # - [gentoo/stage3, systemd, 3002.6, 3, v3002-py3] - [freebsd , 0 , 3002.6, 3, v3002-py3] - [openbsd , 0 , 3002.6, 3, v3002-py3] @@ -4100,8 +4202,8 @@ ssf: - [oraclelinux , 8 , 3001.7, 3, v3001-py3] # - [oraclelinux , 7 , 3001.7, 3, v3001-py3] # # - [arch-base , latest, 3001.7, 3, v3001-py3] - # - [gentoo/stage3, latest, 3001.6, 3, v3001-py3] - # - [gentoo/stage3, systemd, 3001.6, 3, v3001-py3] + # - [gentoo/stage3, latest, 3001.7, 3, v3001-py3] + # - [gentoo/stage3, systemd, 3001.7, 3, v3001-py3] - [openbsd , 0 , 3001.1, 3, v3001-py3] ### `v3000-py3` @@ -4388,6 +4490,8 @@ ssf: - [oraclelinux , 8 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] yamllint: ignore: additional: @@ -4513,6 +4617,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] use_tofs: true semrel_files: *semrel_files_default telegraf: @@ -4543,6 +4649,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] use_tofs: true semrel_files: *semrel_files_default template: @@ -4607,6 +4715,8 @@ ssf: - [oraclelinux , 0 , master, 0, default] - [arch-base , 0 , master, 0, default] - [gentoo/stage3, 0 , master, 0, gentoo] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] use_libsaltcli: true use_tofs: true semrel_files: @@ -4704,6 +4814,8 @@ ssf: - [debian , 10 , 0 , 0] - [centos , 8 , 0 , 0] - [oraclelinux , 8 , 0 , 0] + - [almalinux , 0 , 0 , 0] + - [rockylinux , 0 , 0 , 0] inspec_yml: summary: >- Verify that the ufw formula is setup and configured correctly @@ -4748,6 +4860,8 @@ ssf: - [oraclelinux , 7 , master, 0, without-ipv6] - [arch-base , 0 , master, 0, without-ipv6] - [gentoo/stage3, 0 , master, 0, without-ipv6] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, default] use_tofs: true semrel_files: *semrel_files_default users: @@ -4807,6 +4921,8 @@ ssf: - [oraclelinux , 0 , master, 0, vimrc] # # - [arch-base , 0 , master, 0, vimrc] # # - [gentoo/stage3, 0 , master, 0, vimrc] + - [almalinux , 0 , master, 0, vimrc] + - [rockylinux , 0 , master, 0, vimrc] semrel_files: *semrel_files_default varnish: context: @@ -4869,6 +4985,8 @@ ssf: - [oraclelinux , 8 , master, 0, default] - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + - [almalinux , 0 , master, 0, default] + - [rockylinux , 0 , master, 0, 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) use_tofs: legacy @@ -4933,6 +5051,8 @@ ssf: - [oraclelinux , 0 , master, 0, ''] - [arch-base , 0 , master, 0, ''] # # - [gentoo/stage3, 0 , master, 0, ''] + - [almalinux , 0 , master, 0, ''] + - [rockylinux , 0 , master, 0, ''] semrel_files: *semrel_files_default vim: context: @@ -5013,6 +5133,8 @@ ssf: # # - [oraclelinux , 0 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] + # # - [almalinux , 0 , master, 0, default] + # # - [rockylinux , 0 , master, 0, default] use_tofs: true yamllint: rules: From 25ce78a3e7d50584f8d41dc3ebce0b8f2e6ed3fd Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 17 May 2021 10:06:50 +0100 Subject: [PATCH 3/9] feat(pre-commit): add `rst-lint` --- .pre-commit-config.yaml | 11 +++++++++++ ssf/defaults.yaml | 4 ++-- ssf/files/default/.pre-commit-config.yaml | 17 +++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9bc41097..41b5f35d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,3 +52,14 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' + - repo: https://github.com/saltstack-formulas/mirrors-rst-lint + rev: v1.3.2 + hooks: + - id: rst-lint + name: Check reST files using rst-lint + exclude: | + (?x)^( + docs/CHANGELOG.rst| + docs/TOFS_pattern.rst| + )$ + additional_dependencies: [pygments==2.9.0] diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 9d30860b..d44a2332 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -64,8 +64,8 @@ ssf_node_anchors: # An alternative method could be to use: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length rule:quoted-strings - title: "ci: enable Vagrant-based testing using GitHub Actions" - body: '* Automated using https://github.com/myii/ssf-formula/pull/334' + title: "ci(pre-commit): add '`'rst-lint'`' [skip ci]" + body: '* Automated using https://github.com/myii/ssf-formula/pull/335' # yamllint enable rule:line-length rule:quoted-strings github: owner: 'saltstack-formulas' diff --git a/ssf/files/default/.pre-commit-config.yaml b/ssf/files/default/.pre-commit-config.yaml index d923fe8b..ae5a58f4 100644 --- a/ssf/files/default/.pre-commit-config.yaml +++ b/ssf/files/default/.pre-commit-config.yaml @@ -54,3 +54,20 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' + - repo: https://github.com/saltstack-formulas/mirrors-rst-lint + rev: v1.3.2 + hooks: + - id: rst-lint + name: Check reST files using rst-lint + exclude: | + (?x)^( + docs/CHANGELOG.rst| + docs/TOFS_pattern.rst| + {#- Required until the Antora solution is finalised, which then allows + the `readthedocs` site to be disbanded #} + {%- if semrel_formula == 'template' %} + docs/CONTRIBUTING_DOCS.rst| + docs/index.rst| + {%- endif %} + )$ + additional_dependencies: [pygments==2.9.0] From 2ef7b8cb398c9bd2f6f5b2e7becb3dfc639a92c4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 1 Jul 2021 23:47:57 +0100 Subject: [PATCH 4/9] fix(rst-lint): fix violations --- .pre-commit-config.yaml | 1 + docs/CONTRIBUTING.rst | 2 +- ssf/files/default/.pre-commit-config.yaml | 3 +++ ssf/files/default/docs/CONTRIBUTING.rst | 2 +- ssf/files/tofs_ssf-formula/docs/CONTRIBUTING.rst | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 41b5f35d..3f117aec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -61,5 +61,6 @@ repos: (?x)^( docs/CHANGELOG.rst| docs/TOFS_pattern.rst| + ssf/files/default/docs/TOFS_pattern.rst| )$ additional_dependencies: [pygments==2.9.0] diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index 23f3f22a..5845acb3 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -165,7 +165,7 @@ To preserve good formatting of these notes, the following format is prescribed: An example of that: -.. code-block:: git +.. code-block:: console ... diff --git a/ssf/files/default/.pre-commit-config.yaml b/ssf/files/default/.pre-commit-config.yaml index ae5a58f4..61bcdabf 100644 --- a/ssf/files/default/.pre-commit-config.yaml +++ b/ssf/files/default/.pre-commit-config.yaml @@ -68,6 +68,9 @@ repos: {%- if semrel_formula == 'template' %} docs/CONTRIBUTING_DOCS.rst| docs/index.rst| + {#- Required until the `TOFS_pattern.rst` template is fixed #} + {%- elif semrel_formula == 'ssf' %} + ssf/files/default/docs/TOFS_pattern.rst| {%- endif %} )$ additional_dependencies: [pygments==2.9.0] diff --git a/ssf/files/default/docs/CONTRIBUTING.rst b/ssf/files/default/docs/CONTRIBUTING.rst index f063e7b3..e5cbb835 100644 --- a/ssf/files/default/docs/CONTRIBUTING.rst +++ b/ssf/files/default/docs/CONTRIBUTING.rst @@ -165,7 +165,7 @@ To preserve good formatting of these notes, the following format is prescribed: An example of that: -.. code-block:: git +.. code-block:: console ... diff --git a/ssf/files/tofs_ssf-formula/docs/CONTRIBUTING.rst b/ssf/files/tofs_ssf-formula/docs/CONTRIBUTING.rst index 23f3f22a..5845acb3 100644 --- a/ssf/files/tofs_ssf-formula/docs/CONTRIBUTING.rst +++ b/ssf/files/tofs_ssf-formula/docs/CONTRIBUTING.rst @@ -165,7 +165,7 @@ To preserve good formatting of these notes, the following format is prescribed: An example of that: -.. code-block:: git +.. code-block:: console ... From 338ed9aaab34f8c26830f6f522914689b83a5b73 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 27 Jun 2021 23:18:42 +0100 Subject: [PATCH 5/9] feat(gemfile.lock): update `kitchen-docker` revision Add support for `almalinux` & `rockylinux`: * https://github.com/test-kitchen/kitchen-docker/pull/384 * https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker/-/commit/1f543f654da5 --- Gemfile.lock | 2 +- ssf/files/default/Gemfile.lock | 2 +- ssf/files/tofs_openssh-formula/Gemfile.lock | 2 +- ssf/files/tofs_openvpn-formula/Gemfile.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d7cbc3b1..6ad4ef9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) diff --git a/ssf/files/default/Gemfile.lock b/ssf/files/default/Gemfile.lock index d7cbc3b1..6ad4ef9d 100644 --- a/ssf/files/default/Gemfile.lock +++ b/ssf/files/default/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) diff --git a/ssf/files/tofs_openssh-formula/Gemfile.lock b/ssf/files/tofs_openssh-formula/Gemfile.lock index ef26d96b..e2f62f3a 100644 --- a/ssf/files/tofs_openssh-formula/Gemfile.lock +++ b/ssf/files/tofs_openssh-formula/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) diff --git a/ssf/files/tofs_openvpn-formula/Gemfile.lock b/ssf/files/tofs_openvpn-formula/Gemfile.lock index 0cc1955f..e290da97 100644 --- a/ssf/files/tofs_openvpn-formula/Gemfile.lock +++ b/ssf/files/tofs_openvpn-formula/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) From 2bd30f3cba86ad4e76b401adc08c88af62ef30f4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 30 Jun 2021 00:24:47 +0100 Subject: [PATCH 6/9] feat(suricata): disable failing instances --- ssf/formulas.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index fe8987a6..9db62b06 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -4481,13 +4481,11 @@ ssf: # # - [debian , 0 , master, 0, default] - [ubuntu , 0 , master, 0, default] # # - [centos , 0 , master, 0, default] - - [centos , 8 , master, 0, default] # # - [fedora , 0 , master, 0, default] # # - [opensuse/leap, 0 , master, 0, default] # # - [opensuse/tmbl, 0 , master, 0, default] # # - [amazonlinux , 0 , master, 0, default] # # - [oraclelinux , 0 , master, 0, default] - - [oraclelinux , 8 , master, 0, default] # # - [arch-base , 0 , master, 0, default] # # - [gentoo/stage3, 0 , master, 0, default] # # - [almalinux , 0 , master, 0, default] From f638761348eec9debef00d6e83bc315886222c97 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 1 Jul 2021 19:58:48 +0100 Subject: [PATCH 7/9] feat(nginx): disable failing instance until upstream issue resolved * https://github.com/phusion/passenger/issues/2364#issuecomment-866313663 --- ssf/formulas.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 9db62b06..cda7b8e3 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -2848,7 +2848,11 @@ ssf: - [debian , 0 , master, 0, ''] # # - [ubuntu , 0 , master, 0, default] - [ubuntu , 0 , master, 0, ''] - - [centos , 0 , master, 0, ''] + # # Use this again when the `passenger` issue is resolved + # # https://github.com/phusion/passenger/issues/2364#issuecomment-866313663 + # # - [centos , 0 , master, 0, ''] + - [centos , 8 , master, 0, ''] + - [centos , 7 , master, 0, default] - [fedora , 0 , master, 0, default] - [opensuse/leap, 0 , master, 0, default] - [opensuse/tmbl, 0 , master, 0, default] From d8310d385872d68ac24f108580f9415ab2db63cb Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 1 Jul 2021 20:34:41 +0100 Subject: [PATCH 8/9] feat(saltimages): update with latest changes from `salt-image-builder` * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/merge_requests/108 --- ssf/defaults.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index d44a2332..36a11660 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -467,8 +467,6 @@ ssf: ### `3003.0-py3` - [fedora , 34 , 3003.0, 3] # fedo-34.0-3003.0-py3 - [fedora , 33 , 3003.0, 3] # fedo-33.0-3003.0-py3 - - [gentoo/stage3, latest, 3003.0, 3] # gent-late-3003.0-py3 - - [gentoo/stage3, systemd, 3003.0, 3] # gent-sysd-3003.0-py3 ### `3002.5-py3` - [gentoo/stage3, latest, 3002.5, 3] # gent-late-3002.5-py3 @@ -503,6 +501,8 @@ ssf: - [oraclelinux , 8 , 3003.0, 3] # orac-08.0-3003.0-py3 - [oraclelinux , 7 , 3003.0, 3] # orac-07.0-3003.0-py3 - [arch-base , latest, 3003.0, 3] # arch-late-3003.0-py3 + - [gentoo/stage3, latest, 3003.0, 3] # gent-late-3003.0-py3 + - [gentoo/stage3, systemd, 3003.0, 3] # gent-sysd-3003.0-py3 ### `3002.6-py3` - [ubuntu , 16.04, 3002.6, 3] # ubun-16.0-3002.6-py3 From 26c7f76a9ccad43116029992ca696a856aa325b4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 1 Jul 2021 23:49:53 +0100 Subject: [PATCH 9/9] chore(defaults): update commit title and body --- ssf/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 36a11660..e2bdb5b9 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -64,7 +64,7 @@ ssf_node_anchors: # An alternative method could be to use: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length rule:quoted-strings - title: "ci(pre-commit): add '`'rst-lint'`' [skip ci]" + title: "ci(3003.1): update inc. AlmaLinux, Rocky & '`'rst-lint'`' [skip ci]" body: '* Automated using https://github.com/myii/ssf-formula/pull/335' # yamllint enable rule:line-length rule:quoted-strings github: