Skip to content

Commit

Permalink
feat(vault): use bootstrapped amazonlinux-1 images
Browse files Browse the repository at this point in the history 
* Able to make this improvement after b51be37 in #92
  • Loading branch information
@myii
myii committed Nov 4, 2019
1 parent 4c83eb8 commit df1b8d6
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 17 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
title: 'feat(semantic-release): implement for this formula'
body: '* Automated using https://github.com/myii/ssf-formula/pull/92'
title: 'ci(kitchen+travis): use bootstrapped `amazonlinux-1` images'
body: '* Automated using https://github.com/myii/ssf-formula/pull/94'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
Expand Down
16 changes: 1 addition & 15 deletions ssf/files/default/kitchen.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,6 @@ driver:
# Make sure the platforms listed below match up with
# the `env.matrix` instances defined in `.travis.yml`
platforms:
{#- TODO: Replace this with new `amazonlinux` (but really need an `upstart`-based replacement) #}
{#- Get rid off `first_linebreak` then as well #}
{%- set first_linebreak = '' %}
{%- if semrel_formula == 'vault' %}
{%- set first_linebreak = '\n' %}
- name: amazonlinux
driver:
image: amazonlinux:1
platform: rhel
run_command: /sbin/init
provision_command:
# install latest stable Salt
- curl -L https://bootstrap.saltstack.com | sh -s -- -X
{%- endif %}
{#- Centralise duplication from here and `libcimatrix.jinja` #}
{%- set prev_comment = '' %}
{%- for platform in platforms %}
Expand All @@ -153,7 +139,7 @@ platforms:
{%- set linebreak = '\n' %}
{%- set comment = '`{0}`'.format(salt_ver) %}
{%- if loop.index0 == 0 %}
{%- set linebreak = first_linebreak %}
{%- set linebreak = '' %}
{%- endif %}
{%- if prev_comment != comment %}
{{ linebreak }} ## SALT {{ comment }}
Expand Down
40 changes: 40 additions & 0 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2038,6 +2038,42 @@ ssf:
# - dev_server
- prod_server
- ''
platforms:
# [os , os_ver, salt_ver, py_ver]
- [amazonlinux , 1 , master, 2]
- [debian , 10 , master, 3]
- [ubuntu , 18.04, master, 3]
- [centos , 8 , master, 3]
- [fedora , 31 , master, 3]
- [opensuse/leap, 15.1 , master, 3]
- [amazonlinux , 2 , master, 2]
- [arch-base , latest, master, 2]
- [amazonlinux , 1 , 2019.2, 2]
- [debian , 10 , 2019.2, 3]
- [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]
- [centos , 7 , 2019.2, 2]
- [amazonlinux , 2 , 2019.2, 2]
- [arch-base , latest, 2019.2, 2]
- [fedora , 30 , 2018.3, 3]
- [amazonlinux , 1 , 2018.3, 2]
- [debian , 9 , 2018.3, 2]
- [ubuntu , 16.04, 2018.3, 2]
- [centos , 7 , 2018.3, 2]
- [opensuse/leap, 15.1 , 2018.3, 2]
- [amazonlinux , 2 , 2018.3, 2]
- [arch-base , latest, 2018.3, 2]
- [amazonlinux , 1 , 2017.7, 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 , 2 , 2017.7, 2]
- [arch-base , latest, 2017.7, 2]
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, '']
Expand All @@ -2051,23 +2087,27 @@ ssf:
# If values are set, only use these as commented entries in the matrix
platforms_matrix_commented_includes:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [amazonlinux , 1 , master, 2, '']
- [ubuntu , 18.04, master, 3, '']
- [centos , 8 , master, 3, '']
- [fedora , 31 , master, 3, '']
- [opensuse/leap, 15.1 , master, 3, '']
- [amazonlinux , 2 , master, 2, '']
- [arch-base , latest, master, 2, '']
- [amazonlinux , 1 , 2019.2, 2, '']
- [debian , 10 , 2019.2, 3, ''] # CHECK
- [debian , 9 , 2019.2, 3, '']
- [centos , 8 , 2019.2, 3, '']
- [opensuse/leap, 15.1 , 2019.2, 3, '']
- [centos , 7 , 2019.2, 2, ''] # CHECK
- [arch-base , latest, 2019.2, 2, '']
- [amazonlinux , 1 , 2018.3, 2, '']
- [fedora , 30 , 2018.3, 3, '']
- [debian , 9 , 2018.3, 2, '']
- [ubuntu , 16.04, 2018.3, 2, '']
- [amazonlinux , 2 , 2018.3, 2, '']
- [arch-base , latest, 2018.3, 2, '']
- [amazonlinux , 1 , 2017.7, 2, '']
- [debian , 8 , 2017.7, 2, '']
- [ubuntu , 16.04, 2017.7, 2, '']
- [centos , 6 , 2017.7, 2, '']
Expand Down

0 comments on commit df1b8d6

Please sign in to comment.