Skip to content

Commit

Permalink
ci(amazon): use py2 until py3 images can be prepared (revert later)
Browse files Browse the repository at this point in the history
  • Loading branch information
@myii
myii committed Oct 29, 2019
1 parent cad8888 commit 9b1be95
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ ssf_node_anchors:
- [centos , 8 , master, 3]
- [fedora , 31 , master, 3]
- [opensuse/leap, 15.1 , master, 3]
- [amazonlinux , 2 , master, 3]
### ` master-py2`
- [amazonlinux , 2 , master, 2]
- [arch-base , latest, master, 2]

### `2019.2-py3`
Expand All @@ -106,10 +106,10 @@ ssf_node_anchors:
# - [centos , 7 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [opensuse/leap, 15.1 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 3]
### `2019.2-py2`
# - [ubuntu , 18.04, 2019.2, 2]
- [centos , 7 , 2019.2, 2]
- [amazonlinux , 2 , 2019.2, 2]
- [arch-base , latest, 2019.2, 2]

### `2018.3-py3`
Expand Down Expand Up @@ -141,7 +141,7 @@ ssf_node_anchors:
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [arch-base , latest, 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
Expand Down
66 changes: 33 additions & 33 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ ssf_node_anchors:
# [os , os_ver, salt_ver, py_ver]
- [centos , 8 , master, 3]
- [fedora , 31 , master, 3]
- [amazonlinux , 2 , master, 3]
- [amazonlinux , 2 , master, 2]
- [centos , 8 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 2]
- [centos , 7 , 2019.2, 2]
- [fedora , 30 , 2018.3, 3]
- [centos , 7 , 2018.3, 2]
Expand Down Expand Up @@ -109,8 +109,8 @@ ssf_node_anchors:
- [centos , 6 , 2017.7, 2]
# platforms_os_amazonlinux: &platforms_os_amazonlinux
# # [os , os_ver, salt_ver, py_ver]
# - [amazonlinux , 2 , master, 3]
# - [amazonlinux , 2 , 2019.2, 3]
# - [amazonlinux , 2 , master, 2]
# - [amazonlinux , 2 , 2019.2, 2]
# - [amazonlinux , 2 , 2018.3, 2]
# - [amazonlinux , 2 , 2017.7, 2]
platforms_os_centos_and_arch: &platforms_os_centos_and_arch
Expand Down Expand Up @@ -138,7 +138,7 @@ ssf_node_anchors:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, debian]
- [ubuntu , 18.04, 2019.2, 3, debian]
- [amazonlinux , 2 , 2019.2, 3, redhat]
- [amazonlinux , 2 , 2019.2, 2, redhat]
- [fedora , 30 , 2018.3, 3, redhat]
- [opensuse/leap, 15.1 , 2018.3, 2, suse]
- [centos , 6 , 2017.7, 2, redhat]
Expand All @@ -156,7 +156,7 @@ 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, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [arch-base , latest, 2018.3, 2, default]
# - [centos , 6 , 2017.7, 2, default]
Expand All @@ -166,7 +166,7 @@ ssf_node_anchors:
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [opensuse/leap, 15.1 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
# - [arch-base , latest, 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
Expand Down Expand Up @@ -254,7 +254,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
# - [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -425,7 +425,7 @@ 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]
# - [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -464,15 +464,15 @@ ssf:
# - [centos , 8 , master, 3, default]
# - [fedora , 31 , master, 3, default]
# - [opensuse/leap, 15.1 , master, 3, default]
# # - [amazonlinux , 2 , master, 3, default]
# # - [Amazonlinux , 2 , master, 2, default]
# # - [arch-base , latest, master, 2, default]
- [debian , 10 , 2019.2, 3, default] # CHECK
- [debian , 9 , 2019.2, 3, default]
# - [ubuntu , 18.04, 2019.2, 3, default]
# - [centos , 8 , 2019.2, 3, default]
- [fedora , 31 , 2019.2, 3, default]
# # - [opensuse/leap, 15.1 , 2019.2, 3, default]
# # - [amazonlinux , 2 , 2019.2, 3, default]
# # - [amazonlinux , 2 , 2019.2, 2, default]
# - [centos , 7 , 2019.2, 2, default]
# # - [arch-base , latest, 2019.2, 2, default]
# - [fedora , 30 , 2018.3, 3, default]
Expand Down Expand Up @@ -509,7 +509,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
# - [fedora , 30 , 2018.3, 3, default]
- [centos , 7 , 2018.3, 2, default]
Expand Down Expand Up @@ -584,7 +584,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 2, default]
- [arch-base , latest, 2019.2, 2, default]
- [fedora , 31 , 2019.2, 3, default]
# - [fedora , 30 , 2018.3, 3, default]
Expand All @@ -606,7 +606,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [debian , 9 , 2018.3, 2, default]
Expand Down Expand Up @@ -676,7 +676,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
- [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [centos , 7 , 2018.3, 2, default]
Expand Down Expand Up @@ -909,7 +909,7 @@ ssf:
- [debian , 10 , master, 3, clean]
- [ubuntu , 18.04, 2019.2, 3, default]
- [fedora , 31 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
# - [fedora , 30 , 2018.3, 3, default]
- [centos , 7 , 2018.3, 2, default]
Expand Down Expand Up @@ -947,7 +947,7 @@ 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]
# - [amazonlinux , 2 , 2019.2, 2, default]
- [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, fedora]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -999,11 +999,11 @@ ssf:
# One `#` where working but not using, two `# #` for not working at all
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
# - [amazonlinux , 2 , master, 3, default]
# - [amazonlinux , 2 , master, 2, default]
# # - [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, 2, default]
# # - [arch-base , latest, 2019.2, 2, default]
- [centos , 7 , 2018.3, 2, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -1056,7 +1056,7 @@ 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]
# - [amazonlinux , 2 , 2019.2, 2, default]
- [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -1104,7 +1104,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
# - [fedora , 30 , 2018.3, 3, default]
- [centos , 7 , 2018.3, 2, default]
Expand Down Expand Up @@ -1184,7 +1184,7 @@ ssf:
platforms_matrix:
- [debian , 10 , master, 3, debian]
- [ubuntu , 18.04, 2019.2, 3, ubuntu]
- [amazonlinux , 2 , 2019.2, 3, redhat]
- [amazonlinux , 2 , 2019.2, 2, redhat]
- [fedora , 30 , 2018.3, 3, redhat]
- [opensuse/leap, 15.1 , 2018.3, 2, suse]
- [centos , 6 , 2017.7, 2, redhat]
Expand Down Expand Up @@ -1231,7 +1231,7 @@ ssf:
- [debian , 10 , master, 3, default]
- [centos , 8 , 2019.2, 3, default]
- [fedora , 31 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
- [ubuntu , 16.04, 2018.3, 2, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -1281,7 +1281,7 @@ ssf:
- [debian , 10 , master, 3, default]
- [centos , 8 , 2019.2, 3, default]
- [fedora , 31 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 3, default]
# - [amazonlinux , 2 , 2019.2, 2, default]
# - [arch-base , latest, 2019.2, 2, default]
- [debian , 9 , 2018.3, 2, default]
- [ubuntu , 16.04, 2018.3, 2, default]
Expand Down Expand Up @@ -1372,7 +1372,7 @@ ssf:
- [ubuntu , 18.04, 2019.2, 2]
- [centos , 7 , 2019.2, 2]
- [opensuse/leap, 15.1 , 2019.2, 2]
- [amazonlinux , 2 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 2]
- [arch-base , latest, 2019.2, 2]
inspec_yml:
summary: >-
Expand Down Expand Up @@ -1456,7 +1456,7 @@ ssf:
- [ubuntu , 18.04, 2019.2, 2]
- [centos , 7 , 2019.2, 2]
- [opensuse/leap, 15.1 , 2019.2, 2]
- [amazonlinux , 2 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 2]
- [arch-base , latest, 2019.2, 2]
- [debian , 10 , 2019.2, 3]
- [ubuntu , 18.04, 2019.2, 3]
Expand All @@ -1482,7 +1482,7 @@ ssf:
- [ubuntu , 18.04, 2019.2, 2, v201902-py2]
# - [centos , 7 , 2019.2, 2, v201902-py2]
# - [opensuse/leap, 15.1 , 2019.2, 2, v201902-py2]
# - [amazonlinux , 2 , 2019.2, 3, v201902-py2]
# - [amazonlinux , 2 , 2019.2, 2, v201902-py2]
# # - [arch-base , latest, 2019.2, 2, v201902-py2]
# - [debian , 10 , 2019.2, 3, v201902-py3]
# - [ubuntu , 18.04, 2019.2, 3, v201902-py3]
Expand Down Expand Up @@ -1662,7 +1662,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
- [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -1732,14 +1732,14 @@ ssf:
- [centos , 8 , master, 3]
- [fedora , 31 , master, 3]
- [opensuse/leap, 15.1 , master, 3]
- [amazonlinux , 2 , master, 3]
- [amazonlinux , 2 , master, 2]
- [arch-base , latest, master, 2]
- [debian , 9 , 2019.2, 3]
- [ubuntu , 18.04, 2019.2, 3]
- [centos , 8 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [opensuse/leap, 15.1 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 2]
- [centos , 7 , 2019.2, 2] # CHECK
- [arch-base , latest, 2019.2, 2]
- [fedora , 30 , 2018.3, 3]
Expand Down Expand Up @@ -1824,7 +1824,7 @@ ssf:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 3, default]
- [amazonlinux , 2 , 2019.2, 2, default]
- [arch-base , latest, 2019.2, 2, default]
- [fedora , 30 , 2018.3, 3, default]
- [opensuse/leap, 15.1 , 2018.3, 2, default]
Expand Down Expand Up @@ -1938,7 +1938,7 @@ ssf:
- [debian , 10 , master, 3, '']
- [ubuntu , 18.04, 2019.2, 3, prod_server]
- [fedora , 31 , 2019.2, 3, prod_server]
- [amazonlinux , 2 , 2019.2, 3, prod_server]
- [amazonlinux , 2 , 2019.2, 2, prod_server]
- [centos , 7 , 2018.3, 2, prod_server]
- [opensuse/leap, 15.1 , 2018.3, 2, prod_server]
- [arch-base , latest, 2017.7, 2, prod_server]
Expand All @@ -1950,7 +1950,7 @@ ssf:
- [centos , 8 , master, 3, '']
- [fedora , 31 , master, 3, '']
- [opensuse/leap, 15.1 , master, 3, '']
- [amazonlinux , 2 , master, 3, '']
- [amazonlinux , 2 , master, 2, '']
- [arch-base , latest, master, 2, '']
- [debian , 10 , 2019.2, 3, ''] # CHECK
- [debian , 9 , 2019.2, 3, '']
Expand Down

0 comments on commit 9b1be95

Please sign in to comment.