Skip to content

Commit

Permalink
feat: workaround issues with newly introduced amazonlinux-1
Browse files Browse the repository at this point in the history 
* `amazonlinux-1-py2`: not a straight drop-in for `amazonlinux-2-py2`
* `amazonlinux-2-py3`: switch to this where possible instead
  • Loading branch information
@myii
myii committed Feb 12, 2020
1 parent 86be912 commit 387bde5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 38 deletions.
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,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(gemfile): remove unused '`'rspec-retry'`' gem [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/126'
title: "ci: workaround issues with newly introduced '`'amazonlinux-1'`' [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/127'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down
55 changes: 19 additions & 36 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,11 @@ ssf_node_anchors:
- [ubuntu , 18.04, 2019.2, 3, default]
# # - [centos , 8 , 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [fedora , 30 , 2018.3, 3, default]
- [arch-base , latest, 2018.3, 2, default]
# - [centos , 6 , 2017.7, 2, default]
- [amazonlinux , 1 , 2017.7, 2, default]
# - [amazonlinux , 1 , 2017.7, 2, default]
platforms_matrix_without_arch: &platforms_matrix_without_arch
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
Expand Down Expand Up @@ -623,22 +623,7 @@ ssf:
provisioner:
pillars_from_files:
- .sls: 'test/salt/pillar/default.sls'
platforms:
# Later, consider using for all *platforms_osfamily_redhat
# [os , os_ver, salt_ver, py_ver]
- [centos , 8 , master, 3]
- [fedora , 31 , master, 3]
- [amazonlinux , 2 , master, 3]
- [centos , 8 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 3]
- [centos , 7 , 2019.2, 2]
- [fedora , 30 , 2018.3, 3]
- [centos , 7 , 2018.3, 2]
- [amazonlinux , 1 , 2018.3, 2]
- [centos , 6 , 2017.7, 2]
- [fedora , 30 , 2017.7, 2]
- [amazonlinux , 1 , 2017.7, 2]
platforms: *platforms_osfamily_redhat
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [centos , 8 , master, 3, default]
Expand Down Expand Up @@ -710,9 +695,11 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [ubuntu , 18.04, master, 3, default]
- [debian , 9 , 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2019.2, 3, default]
- [amazonlinux , 1 , 2018.3, 2, default]
- [ubuntu , 16.04, 2017.7, 2, default]
- [fedora , 31 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
- [arch-base , latest, 2018.3, 2, default]
# - [ubuntu , 16.04, 2017.7, 2, default]
semrel_files: *semrel_files_default
golang:
context:
Expand Down Expand Up @@ -920,8 +907,8 @@ ssf:
- [ubuntu , 18.04, 2019.2, 3, default]
# # - [centos , 8 , 2019.2, 3, centarch]
- [opensuse/leap, 15.1 , 2019.2, 3, default]
- [arch-base , latest, 2019.2, 2, centarch]
- [amazonlinux , 1 , 2018.3, 2, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [arch-base , latest, 2018.3, 2, centarch]
use_tofs: true
yamllint:
ignore:
Expand Down Expand Up @@ -1025,10 +1012,10 @@ ssf:
- [debian , 10 , master, 3, deb]
- [ubuntu , 18.04, 2019.2, 3, git]
- [centos , 8 , 2019.2, 3, git]
- [amazonlinux , 2 , 2019.2, 3, rpm]
- [arch-base , latest, 2019.2, 2, git]
- [fedora , 30 , 2018.3, 3, git]
- [opensuse/leap, 15.1 , 2018.3, 2, git]
- [amazonlinux , 1 , 2017.7, 2, rpm]
semrel_files: *semrel_files_default
libvirt:
context:
Expand Down Expand Up @@ -1075,7 +1062,6 @@ ssf:
- [fedora , 31 , 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
- [ubuntu , 16.04, 2018.3, 2, default]
- [amazonlinux , 1 , 2017.7, 2, default]
use_tofs: true
semrel_files: *semrel_files_default
locale:
Expand Down Expand Up @@ -1106,8 +1092,8 @@ ssf:
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [fedora , 31 , 2019.2, 3, redhat]
- [opensuse/leap, 15.1 , 2019.2, 3, default]
- [amazonlinux , 1 , 2018.3, 2, redhat]
- [amazonlinux , 2 , 2019.2, 3, redhat]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
- [arch-base , latest, 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
semrel_files: *semrel_files_default
Expand Down Expand Up @@ -1161,13 +1147,12 @@ ssf:
# # - [arch-base , latest, master, 2, default]
- [ubuntu , 18.04, 2019.2, 3, default]
# # - [fedora , 31 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
# # - [arch-base , latest, 2019.2, 2, default]
# # - [centos , 7 , 2018.3, 2, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
# # - [arch-base , latest, 2018.3, 2, default]
# - [centos , 6 , 2017.7, 2, default]
- [amazonlinux , 1 , 2017.7, 2, default]
# # - [arch-base , latest, 2017.7, 2, default]
semrel_files: *semrel_files_default
mattermost:
Expand All @@ -1191,9 +1176,9 @@ ssf:
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [centos , 8 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [fedora , 30 , 2018.3, 3, default]
- [arch-base , latest, 2018.3, 2, default]
- [amazonlinux , 1 , 2017.7, 2, default]
semrel_files: *semrel_files_default
mongodb:
context:
Expand Down Expand Up @@ -1266,9 +1251,9 @@ ssf:
- [ubuntu , 18.04, 2019.2, 3, default]
- [centos , 8 , 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [fedora , 30 , 2018.3, 3, default]
- [arch-base , latest, 2018.3, 2, default]
- [amazonlinux , 1 , 2017.7, 2, default]
semrel_files: *semrel_files_default
nginx:
context:
Expand Down Expand Up @@ -2064,10 +2049,8 @@ ssf:
- [ubuntu , 18.04, 2019.2, 3, default]
- [centos , 8 , 2019.2, 3, default]
- [fedora , 31 , 2019.2, 3, default]
# - [fedora , 30 , 2018.3, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
- [amazonlinux , 1 , 2018.3, 2, default]
# - [centos , 6 , 2017.7, 2, default]
- [arch-base , latest, 2017.7, 2, default]
semrel_files: *semrel_files_default
syslog-ng:
Expand Down Expand Up @@ -2149,14 +2132,14 @@ ssf:
- [ubuntu , 16.04, 2018.3, 2]
- [centos , 7 , 2018.3, 2]
- [opensuse/leap, 15.1 , 2018.3, 2]
- [amazonlinux , 1 , 2018.3, 2]
# - [amazonlinux , 1 , 2018.3, 2]
- [arch-base , latest, 2018.3, 2]
- [debian , 8 , 2017.7, 2]
- [ubuntu , 16.04, 2017.7, 2]
# - [centos , 6 , 2017.7, 2]
- [fedora , 30 , 2017.7, 2]
- [opensuse/leap, 15.1 , 2017.7, 2]
- [amazonlinux , 1 , 2017.7, 2]
# - [amazonlinux , 1 , 2017.7, 2]
- [arch-base , latest, 2017.7, 2]
platforms_matrix: *platforms_matrix_systemd_only
rubocop:
Expand Down

0 comments on commit 387bde5

Please sign in to comment.