Skip to content

Commit

Permalink
Merge pull request #331 from myii/feat/update-latest-saltimages-changes
Browse files Browse the repository at this point in the history 
feat(saltimages): update with latest changes from `salt-image-builder`
  • Loading branch information
@myii
myii authored Jun 21, 2021
2 parents d12615d + 9750033 commit 24f4686
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 50 deletions.
33 changes: 20 additions & 13 deletions ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(gitlab-ci): enable Arch Linux [skip ci]"
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/330'
title: "ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/331'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -341,13 +341,11 @@ ssf:
- [debian , 9 , tiamat, 3] # debi-09.0-tiamat-py3
- [ubuntu , 20.04, tiamat, 3] # ubun-20.0-tiamat-py3
- [ubuntu , 18.04, tiamat, 3] # ubun-18.0-tiamat-py3
- [ubuntu , 16.04, tiamat, 3] # ubun-16.0-tiamat-py3
- [centos , 8 , tiamat, 3] # cent-08.0-tiamat-py3
- [centos , 7 , tiamat, 3] # cent-07.0-tiamat-py3
# # Not available at the current time
# - [fedora , 34 , tiamat, 3] # fedo-34.0-tiamat-py3
# - [fedora , 33 , tiamat, 3] # fedo-33.0-tiamat-py3
# - [fedora , 32 , tiamat, 3] # fedo-32.0-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
Expand All @@ -359,12 +357,10 @@ ssf:
- [debian , 9 , master, 3] # debi-09.0-master-py3
- [ubuntu , 20.04, master, 3] # ubun-20.0-master-py3
- [ubuntu , 18.04, master, 3] # ubun-18.0-master-py3
- [ubuntu , 16.04, master, 3] # ubun-16.0-master-py3
- [centos , 8 , master, 3] # cent-08.0-master-py3
- [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
- [fedora , 32 , master, 3] # fedo-32.0-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
Expand All @@ -383,7 +379,6 @@ ssf:
- [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
- [fedora , 32 , 3003.0, 3] # fedo-32.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
Expand All @@ -398,12 +393,10 @@ ssf:
- [debian , 9 , 3002.6, 3] # debi-09.0-3002.6-py3
- [ubuntu , 20.04, 3002.6, 3] # ubun-20.0-3002.6-py3
- [ubuntu , 18.04, 3002.6, 3] # ubun-18.0-3002.6-py3
- [ubuntu , 16.04, 3002.6, 3] # ubun-16.0-3002.6-py3
- [centos , 8 , 3002.6, 3] # cent-08.0-3002.6-py3
- [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
- [fedora , 32 , 3002.6, 3] # fedo-32.0-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
Expand All @@ -424,12 +417,10 @@ ssf:
- [debian , 9 , 3001.7, 3] # debi-09.0-3001.7-py3
- [ubuntu , 20.04, 3001.7, 3] # ubun-20.0-3001.7-py3
- [ubuntu , 18.04, 3001.7, 3] # ubun-18.0-3001.7-py3
- [ubuntu , 16.04, 3001.7, 3] # ubun-16.0-3001.7-py3
- [centos , 8 , 3001.7, 3] # cent-08.0-3001.7-py3
- [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
- [fedora , 32 , 3001.7, 3] # fedo-32.0-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
Expand All @@ -446,7 +437,6 @@ ssf:
- [debian , 10 , 3000.9, 3] # debi-10.0-3000.9-py3
- [debian , 9 , 3000.9, 3] # debi-09.0-3000.9-py3
- [ubuntu , 18.04, 3000.9, 3] # ubun-18.0-3000.9-py3
- [ubuntu , 16.04, 3000.9, 3] # ubun-16.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.2 , 3000.9, 3] # opsu-15.2-3000.9-py3
Expand All @@ -457,17 +447,27 @@ ssf:
# - [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
- [ubuntu , 16.04, 3000.9, 2] # ubun-16.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
### `tiamat-py3`
- [ubuntu , 16.04, tiamat, 3] # ubun-16.0-tiamat-py3

### `master-py3`
- [ubuntu , 16.04, master, 3] # ubun-16.0-master-py3
- [fedora , 32 , master, 3] # fedo-32.0-master-py3
- [fedora , 31 , master, 3] # fedo-31.0-master-py3

### `3003.0-py3`
- [fedora , 32 , 3003.0, 3] # fedo-32.0-3003.0-py3

### `3002.6-py3`
- [ubuntu , 16.04, 3002.6, 3] # ubun-16.0-3002.6-py3
- [fedora , 32 , 3002.6, 3] # fedo-32.0-3002.6-py3
### `3002.5-py3`
- [debian , 10 , 3002.5, 3] # debi-10.0-3002.5-py3
- [debian , 9 , 3002.5, 3] # debi-09.0-3002.5-py3
Expand Down Expand Up @@ -541,6 +541,9 @@ ssf:
- [gentoo/stage3, latest, 3002.0, 3] # gent-late-3002.0-py3
- [gentoo/stage3, systemd, 3002.0, 3] # gent-sysd-3002.0-py3

### `3001.7-py3`
- [ubuntu , 16.04, 3001.7, 3] # ubun-16.0-3001.7-py3
- [fedora , 32 , 3001.7, 3] # fedo-32.0-3001.7-py3
### `3001.6-py3`
- [debian , 10 , 3001.6, 3] # debi-10.0-3001.6-py3
- [debian , 9 , 3001.6, 3] # debi-09.0-3001.6-py3
Expand Down Expand Up @@ -633,6 +636,10 @@ ssf:
- [gentoo/stage3, latest, 3001 , 3] # gent-late-3001.0-py3
- [gentoo/stage3, systemd, 3001 , 3] # gent-sysd-3001.0-py3

### `3000.9-py3`
- [ubuntu , 16.04, 3000.9, 3] # ubun-16.0-3000.9-py3
### `3000.9-py2`
- [ubuntu , 16.04, 3000.9, 2] # ubun-16.0-3000.9-py2
### `3000.8-py3`
- [debian , 10 , 3000.8, 3] # debi-10.0-3000.8-py3
- [debian , 9 , 3000.8, 3] # debi-09.0-3000.8-py3
Expand Down
44 changes: 7 additions & 37 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ ssf_node_anchors:
# # - [centos , 0 , master, 0, default]
- [centos , 7 , master, 0, default]
# # - [fedora , 0 , master, 0, default]
- [fedora , 32 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
- [opensuse/tmbl, 0 , master, 0, default]
- [amazonlinux , 0 , master, 0, default]
Expand Down Expand Up @@ -826,7 +825,6 @@ ssf:
- [ubuntu , 0 , master, 0, default]
- [centos , 0 , master, 0, default]
# # - [fedora , 0 , master, 0, default]
- [fedora , 32 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
- [opensuse/tmbl, 0 , master, 0, default]
- [amazonlinux , 0 , master, 0, default]
Expand Down Expand Up @@ -1049,7 +1047,6 @@ ssf:
- [debian , 9 , master, 0, default]
# # - [ubuntu , 0 , master, 0, default]
- [ubuntu , 18.04, master, 0, default]
- [ubuntu , 16.04, master, 0, default]
- [centos , 0 , master, 0, default]
- [fedora , 0 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
Expand Down Expand Up @@ -1799,7 +1796,6 @@ ssf:
# # - [centos , 0 , master, 0, default]
- [centos , 7 , master, 0, default]
# # - [fedora , 0 , master, 0, default]
- [fedora , 32 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
- [opensuse/tmbl, 0 , master, 0, default]
# # - [amazonlinux , 0 , master, 0, default]
Expand Down Expand Up @@ -2644,7 +2640,6 @@ ssf:
- [debian , 0 , master, 0, default]
# # - [ubuntu , 0 , master, 0, default]
- [ubuntu , 18.04, master, 0, default]
- [ubuntu , 16.04, master, 0, default]
# # - [centos , 0 , master, 0, default]
- [centos , 7 , master, 0, default]
# # - [fedora , 0 , master, 0, default]
Expand Down Expand Up @@ -2778,9 +2773,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 0 , master, 0, '']
# # - [ubuntu , 0 , master, 0, default]
- [ubuntu , 20.04, master, 0, '']
- [ubuntu , 18.04, master, 0, '']
- [ubuntu , 16.04, master, 0, default]
- [ubuntu , 0 , master, 0, '']
- [centos , 0 , master, 0, '']
- [fedora , 0 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
Expand Down Expand Up @@ -2958,9 +2951,7 @@ ssf:
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 0 , master, 0, '']
- [ubuntu , 20.04, master, 0, '']
- [ubuntu , 18.04, master, 0, '']
- [ubuntu , 16.04, master, 0, mode-eq-none]
- [ubuntu , 0 , master, 0, '']
- [centos , 0 , master, 0, '']
- [fedora , 0 , master, 0, '']
- [opensuse/leap, 0 , master, 0, '']
Expand Down Expand Up @@ -3323,7 +3314,6 @@ ssf:
- [centos , 8 , master, 0, redhat8]
- [centos , 7 , master, 0, centos]
# # - [fedora , 0 , master, 0, fedora]
- [fedora , 32 , master, 0, fedora]
- [opensuse/leap, 0 , master, 0, suse]
- [opensuse/tmbl, 0 , master, 0, suse]
- [amazonlinux , 0 , master, 0, amazon]
Expand Down Expand Up @@ -3557,10 +3547,8 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 0 , master, 0, default]
# # - [ubuntu , 0 , master, 0, default]
- [ubuntu , 16.04, master, 0, default]
- [centos , 0 , master, 0, default]
# # - [fedora , 0 , master, 0, default]
- [fedora , 32 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
- [opensuse/tmbl, 0 , master, 0, default]
# # - [amazonlinux , 0 , master, 0, default]
Expand Down Expand Up @@ -3720,9 +3708,7 @@ ssf:
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 0 , master, 0, '']
- [ubuntu , 20.04, master, 0, '']
- [ubuntu , 18.04, master, 0, '']
- [ubuntu , 16.04, master, 0, default]
- [ubuntu , 0 , master, 0, '']
- [centos , 0 , master, 0, '']
- [fedora , 0 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
Expand Down Expand Up @@ -4038,9 +4024,9 @@ ssf:
# - [ubuntu , 18.04, 3003.0, 3, v3003-py3]
- [centos , 8 , 3003.0, 3, v3003-py3]
# - [centos , 7 , 3003.0, 3, v3003-py3]
# # Unavailable below since only installs `3003.X`
- [fedora , 34 , 3003.0, 3, v3003-py3]
- [fedora , 33 , 3003.0, 3, v3003-py3]
# # - [fedora , 32 , 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]
Expand All @@ -4055,16 +4041,10 @@ ssf:
### `v3002-py3`
# - [debian , 10 , 3002.6, 3, v3002-py3]
- [debian , 9 , 3002.6, 3, v3002-py3]
# - [ubuntu , 20.04, 3002.6, 3, v3002-py3]
- [ubuntu , 18.04, 3002.6, 3, v3002-py3]
# - [ubuntu , 16.04, 3002.6, 3, v3002-py3]
- [ubuntu , 20.04, 3002.6, 3, v3002-py3]
# - [ubuntu , 18.04, 3002.6, 3, v3002-py3]
# - [centos , 8 , 3002.6, 3, v3002-py3]
- [centos , 7 , 3002.6, 3, v3002-py3]
# # Installs `3003.X`
# # - [fedora , 34 , 3002.6, 3, v3002-py3]
# # - [fedora , 33 , 3002.6, 3, v3002-py3]
# # Still installs `3001.X`
# # - [fedora , 32 , 3002.6, 3, v3002-py3]
# # Note, `3002.2` is the last in this series for openSUSE
- [opensuse/leap, 15.2 , 3002.2, 3, v3002-py3]
- [opensuse/tmbl, latest, 3002.2, 3, v3002-py3]
Expand All @@ -4083,13 +4063,8 @@ ssf:
# - [debian , 9 , 3001.7, 3, v3001-py3]
- [ubuntu , 20.04, 3001.7, 3, v3001-py3]
# - [ubuntu , 18.04, 3001.7, 3, v3001-py3]
# - [ubuntu , 16.04, 3001.7, 3, v3001-py3]
- [centos , 8 , 3001.7, 3, v3001-py3]
# - [centos , 7 , 3001.7, 3, v3001-py3]
# # Probably doesn't work with Python 3.9
# # - [fedora , 34 , 3001.7, 3, v3001-py3]
# # - [fedora , 33 , 3001.7, 3, v3001-py3]
- [fedora , 32 , 3001.7, 3, v3001-py3]
# # Installs `3002.X`
# # - [opensuse/leap, 15.2 , 3001.7, 3, v3001-py3]
# # - [opensuse/tmbl, latest, 3001.7, 3, v3001-py3]
Expand All @@ -4105,7 +4080,6 @@ ssf:
# - [debian , 10 , 3000.9, 3, v3000-py3]
- [debian , 9 , 3000.9, 3, v3000-py3]
- [ubuntu , 18.04, 3000.9, 3, v3000-py3]
# - [ubuntu , 16.04, 3000.9, 3, v3000-py3]
# - [centos , 8 , 3000.9, 3, v3000-py3]
- [centos , 7 , 3000.9, 3, v3000-py3]
# # Installs `3002.X`
Expand All @@ -4117,8 +4091,7 @@ ssf:
# - [gentoo/stage3, systemd, 3000.9, 3, v3000-py3]

### `v3000-py2`
# - [ubuntu , 18.04, 3000.9, 2, v3000-py2]
- [ubuntu , 16.04, 3000.9, 2, v3000-py2]
- [ubuntu , 18.04, 3000.9, 2, v3000-py2]
# # - [arch-base , latest, 3000.9, 2, v3000-py2]
testing_freebsd:
active: true
Expand Down Expand Up @@ -4535,7 +4508,6 @@ ssf:
- [ubuntu , 0 , master, 0, default]
- [centos , 0 , master, 0, default]
# # - [fedora , 0 , master, 0, default]
- [fedora , 32 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
# # - [opensuse/tmbl, 0 , master, 0, default]
- [amazonlinux , 0 , master, 0, default]
Expand Down Expand Up @@ -4926,7 +4898,6 @@ ssf:
- [ubuntu , 18.04, master, 0, '']
- [centos , 0 , master, 0, '']
# # - [fedora , 0 , master, 0, '']
- [fedora , 32 , master, 0, '']
- [opensuse/leap, 0 , master, 0, '']
- [opensuse/tmbl, 0 , master, 0, '']
- [amazonlinux , 0 , master, 0, '']
Expand Down Expand Up @@ -5007,7 +4978,6 @@ ssf:
- [ubuntu , 0 , master, 0, default]
# # - [centos , 0 , master, 0, default]
# # - [fedora , 0 , master, 0, default] # 33: v5
- [fedora , 32 , master, 0, default]
- [opensuse/leap, 0 , master, 0, default]
# # - [opensuse/tmbl, 0 , master, 0, default]
# # - [amazonlinux , 0 , master, 0, default]
Expand Down

0 comments on commit 24f4686

Please sign in to comment.