Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use latest pre-salted images for all formulas (inc. 3003) #318

Merged
merged 6 commits into from
Apr 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
191 changes: 141 additions & 50 deletions ssf/defaults.yaml
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: "chore: standardise structure [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/317'
title: "ci(kitchen+gitlab): adjust matrix to add '`'3003'`' [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/318'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -160,7 +160,7 @@ ssf_node_anchors:
- [amazonlinux , 0 , master, 0, default]
- [oraclelinux , 0 , master, 0, default]
- [gentoo/stage3, 0 , master, 0, default]
- [arch-base , 0 , 3002.2, 0, default]
- [arch-base , 0 , 3003.0, 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: []
Expand Down Expand Up @@ -325,6 +325,13 @@ ssf:
### `windows`
- [windows , 10 , latest, 3] # wind-10.0-latest-py3
- [windows , 8.1 , latest, 3] # wind-08.1-latest-py3
saltimages_proposed:
### 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.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
saltimages:
### `tiamat-py3`
- [debian , 10 , tiamat, 3] # debi-10.0-tiamat-py3
Expand All @@ -335,6 +342,7 @@ ssf:
- [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
Expand All @@ -351,6 +359,7 @@ ssf:
- [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
Expand All @@ -361,70 +370,117 @@ ssf:
- [gentoo/stage3, latest, master, 3] # gent-late-master-py3
- [gentoo/stage3, systemd, master, 3] # gent-sysd-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 , 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
- [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`
- [debian , 10 , 3002.6, 3] # debi-10.0-3002.6-py3
- [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
- [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`
- [debian , 10 , 3002.5, 3] # debi-10.0-3002.5-py3
- [debian , 9 , 3002.5, 3] # debi-09.0-3002.5-py3
- [ubuntu , 20.04, 3002.5, 3] # ubun-20.0-3002.5-py3
- [ubuntu , 18.04, 3002.5, 3] # ubun-18.0-3002.5-py3
- [ubuntu , 16.04, 3002.5, 3] # ubun-16.0-3002.5-py3
- [centos , 8 , 3002.5, 3] # cent-08.0-3002.5-py3
- [centos , 7 , 3002.5, 3] # cent-07.0-3002.5-py3
- [fedora , 33 , 3002.5, 3] # fedo-33.0-3002.5-py3
- [fedora , 32 , 3002.5, 3] # fedo-32.0-3002.5-py3
# - [opensuse/leap, 15.2 , 3002.5, 3] # opsu-15.2-3002.5-py3
# - [opensuse/tmbl, latest, 3002.5, 3] # opsu-tmbl-3002.5-py3
- [amazonlinux , 2 , 3002.5, 3] # amaz-02.0-3002.5-py3
- [oraclelinux , 8 , 3002.5, 3] # orac-08.0-3002.5-py3
- [oraclelinux , 7 , 3002.5, 3] # orac-07.0-3002.5-py3
- [arch-base , latest, 3002.5, 3] # arch-late-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
### `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

### `3001.7-py3`
- [debian , 10 , 3001.7, 3] # debi-10.0-3001.7-py3
- [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
- [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`
- [debian , 10 , 3001.6, 3] # debi-10.0-3001.6-py3
- [debian , 9 , 3001.6, 3] # debi-09.0-3001.6-py3
- [ubuntu , 20.04, 3001.6, 3] # ubun-20.0-3001.6-py3
- [ubuntu , 18.04, 3001.6, 3] # ubun-18.0-3001.6-py3
- [ubuntu , 16.04, 3001.6, 3] # ubun-16.0-3001.6-py3
- [centos , 8 , 3001.6, 3] # cent-08.0-3001.6-py3
- [centos , 7 , 3001.6, 3] # cent-07.0-3001.6-py3
- [fedora , 33 , 3001.6, 3] # fedo-33.0-3001.6-py3
- [fedora , 32 , 3001.6, 3] # fedo-32.0-3001.6-py3
- [opensuse/leap, 15.2 , 3001.6, 3] # opsu-15.2-3001.6-py3
- [opensuse/tmbl, latest, 3001.6, 3] # opsu-tmbl-3001.6-py3
- [amazonlinux , 2 , 3001.6, 3] # amaz-02.0-3001.6-py3
- [oraclelinux , 8 , 3001.6, 3] # orac-08.0-3001.6-py3
- [oraclelinux , 7 , 3001.6, 3] # orac-07.0-3001.6-py3
- [arch-base , latest, 3001.6, 3] # arch-late-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

### `3000.9-py3`
- [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
- [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
### `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`
- [debian , 10 , 3000.8, 3] # debi-10.0-3000.8-py3
- [debian , 9 , 3000.8, 3] # debi-09.0-3000.8-py3
- [ubuntu , 18.04, 3000.8, 3] # ubun-18.0-3000.8-py3
- [ubuntu , 16.04, 3000.8, 3] # ubun-16.0-3000.8-py3
- [centos , 8 , 3000.8, 3] # cent-08.0-3000.8-py3
- [centos , 7 , 3000.8, 3] # cent-07.0-3000.8-py3
- [opensuse/leap, 15.2 , 3000.8, 3] # opsu-15.2-3000.8-py3
- [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
- [arch-base , latest, 3000.8, 2] # arch-late-3000.8-py2

saltimages_deprecated:
### Deprecated, no longer being built but still available in Docker Hub
### `master-py3`
- [fedora , 31 , master, 3] # fedo-31.0-master-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
- [ubuntu , 20.04, 3002.5, 3] # ubun-20.0-3002.5-py3
- [ubuntu , 18.04, 3002.5, 3] # ubun-18.0-3002.5-py3
- [ubuntu , 16.04, 3002.5, 3] # ubun-16.0-3002.5-py3
- [centos , 8 , 3002.5, 3] # cent-08.0-3002.5-py3
- [centos , 7 , 3002.5, 3] # cent-07.0-3002.5-py3
- [fedora , 34 , 3002.5, 3] # fedo-34.0-3002.5-py3
- [fedora , 33 , 3002.5, 3] # fedo-33.0-3002.5-py3
- [fedora , 32 , 3002.5, 3] # fedo-32.0-3002.5-py3
# - [opensuse/leap, 15.2 , 3002.5, 3] # opsu-15.2-3002.5-py3
# - [opensuse/tmbl, latest, 3002.5, 3] # opsu-tmbl-3002.5-py3
- [amazonlinux , 2 , 3002.5, 3] # amaz-02.0-3002.5-py3
- [oraclelinux , 8 , 3002.5, 3] # orac-08.0-3002.5-py3
- [oraclelinux , 7 , 3002.5, 3] # orac-07.0-3002.5-py3
- [arch-base , latest, 3002.5, 3] # arch-late-3002.5-py3
### `3002.2-py3`
- [debian , 10 , 3002.2, 3] # debi-10.0-3002.2-py3
- [debian , 9 , 3002.2, 3] # debi-09.0-3002.2-py3
Expand Down Expand Up @@ -481,6 +537,23 @@ ssf:
- [gentoo/stage3, latest, 3002.0, 3] # gent-late-3002.0-py3
- [gentoo/stage3, systemd, 3002.0, 3] # gent-sysd-3002.0-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
- [ubuntu , 20.04, 3001.6, 3] # ubun-20.0-3001.6-py3
- [ubuntu , 18.04, 3001.6, 3] # ubun-18.0-3001.6-py3
- [ubuntu , 16.04, 3001.6, 3] # ubun-16.0-3001.6-py3
- [centos , 8 , 3001.6, 3] # cent-08.0-3001.6-py3
- [centos , 7 , 3001.6, 3] # cent-07.0-3001.6-py3
- [fedora , 34 , 3001.6, 3] # fedo-34.0-3001.6-py3
- [fedora , 33 , 3001.6, 3] # fedo-33.0-3001.6-py3
- [fedora , 32 , 3001.6, 3] # fedo-32.0-3001.6-py3
- [opensuse/leap, 15.2 , 3001.6, 3] # opsu-15.2-3001.6-py3
- [opensuse/tmbl, latest, 3001.6, 3] # opsu-tmbl-3001.6-py3
- [amazonlinux , 2 , 3001.6, 3] # amaz-02.0-3001.6-py3
- [oraclelinux , 8 , 3001.6, 3] # orac-08.0-3001.6-py3
- [oraclelinux , 7 , 3001.6, 3] # orac-07.0-3001.6-py3
- [arch-base , latest, 3001.6, 3] # arch-late-3001.6-py3
### `3001.4-py3`
- [debian , 10 , 3001.4, 3] # debi-10.0-3001.4-py3
- [debian , 9 , 3001.4, 3] # debi-09.0-3001.4-py3
Expand Down Expand Up @@ -556,6 +629,21 @@ ssf:
- [gentoo/stage3, latest, 3001 , 3] # gent-late-3001.0-py3
- [gentoo/stage3, systemd, 3001 , 3] # gent-sysd-3001.0-py3

### `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
- [ubuntu , 18.04, 3000.8, 3] # ubun-18.0-3000.8-py3
- [ubuntu , 16.04, 3000.8, 3] # ubun-16.0-3000.8-py3
- [centos , 8 , 3000.8, 3] # cent-08.0-3000.8-py3
- [centos , 7 , 3000.8, 3] # cent-07.0-3000.8-py3
- [opensuse/leap, 15.2 , 3000.8, 3] # opsu-15.2-3000.8-py3
- [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
### `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
- [arch-base , latest, 3000.8, 2] # arch-late-3000.8-py2
### `3000.6-py3`
- [debian , 10 , 3000.6, 3] # debi-10.0-3000.6-py3
- [debian , 9 , 3000.6, 3] # debi-09.0-3000.6-py3
Expand Down Expand Up @@ -1123,14 +1211,17 @@ ssf:
<<: *isk_default
0:
<<: *isk_suite_default
name: 'v3002-py3'
name: 'v3003-py3'
1:
<<: *isk_suite_default
name: 'v3001-py3'
name: 'v3002-py3'
2:
<<: *isk_suite_default
name: 'v3000-py3'
name: 'v3001-py3'
3:
<<: *isk_suite_default
name: 'v3000-py3'
4:
<<: *isk_suite_default
name: 'v3000-py2'
sqldeveloper: *formula_default
Expand Down
3 changes: 0 additions & 3 deletions ssf/files/default/kitchen.vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ platforms:
(os == 'openbsd' and not testing_openbsd.active) or
(os == 'windows' and not testing_windows.active) %}
{%- continue %}
{#- Avoid `master` boxes for the `salt-formula` #}
{%- elif [semrel_formula, salt_ver] == ['salt', 'master'] %}
{%- continue %}
{%- endif %}
- name: {{ os | replace('/', '-') }}-{{ os_ver | replace('.', '') }}-{{ salt_ver | replace('.', '-') }}-py{{ py_ver }}
driver:
Expand Down
25 changes: 19 additions & 6 deletions ssf/files/default/kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,6 @@ image: {{ 'saltimages' if [os, os_ver, salt_ver, py_ver] in saltimages else 'net
{%- elif os in ['arch-base'] %}
{%- do prov_cmds.append('- pacman --noconfirm -Syu systemd') %}
{%- endif %}
{%- elif semrel_formula == 'libvirt' %}
{%- if [os, os_ver] in [['fedora', 33]] %}
{%- do prov_cmds.append('- dnf -y update') %}
{%- do prov_cmds.append('- dnf install -y crypto-policies-scripts') %}
{%- do prov_cmds.append('- update-crypto-policies --set LEGACY') %}
{%- endif %}
{%- elif semrel_formula == 'docker' %}
{%- if os in ['debian', 'ubuntu'] %}
{%- do prov_cmds.append('- apt-get update') %}
Expand All @@ -149,6 +143,25 @@ image: {{ 'saltimages' if [os, os_ver, salt_ver, py_ver] in saltimages else 'net
{%- elif os in ['gentoo/stage3'] %}
{%- do prov_cmds.append('emerge --noreplace --quiet --with-bdeps-auto=n net-firewall/conntrack-tools') %}
{%- endif %}
{%- elif semrel_formula == 'locale' %}
{%- if os in ['arch-base'] %}
{%- do prov_cmds.append('- sed -i -e "/locale/s/^/#/" /etc/pacman.conf') %}
{%- do prov_cmds.append('- pacman --noconfirm -Syu glibc') %}
{%- endif %}
{%- endif %}
{#- Specific to newer versions of Fedora (from `33`) across some of the formulas #}
{#- These instances install `crypto-policies-scripts` during the `kitchen converge`, #}
{#- which then results in the `kitchen verify` hitting the SSH authentication error #}
{%- if os == 'fedora' %}
{%- if [semrel_formula, os_ver] in [
['libvirt', 33],
['libvirt', 34],
['sysstat', 34],
] %}
{%- do prov_cmds.append('- dnf -y update') %}
{%- do prov_cmds.append('- dnf install -y crypto-policies-scripts') %}
{%- do prov_cmds.append('- update-crypto-policies --set LEGACY') %}
{%- endif %}
{%- endif %}
{#- Prepare the commands if available#}
{%- if prov_cmds %}
Expand Down
Loading