From f76e21abbabc25415e38e5c079be7e8a49ea81cf Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Jun 2021 09:03:28 +0100 Subject: [PATCH] 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: