Skip to content

Commit

Permalink
feat(kitchen): use stable for amazonlinux-1 bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Nov 9, 2019
1 parent 7be37f9 commit 3bd1091
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
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: 'ci(kitchen+travis+inspec): add `vimrc` suite'
body: '* Automated using https://github.com/myii/ssf-formula/pull/91'
title: 'ci(kitchen): use `stable` for `amazonlinux-1` bootstrap [skip ci]'
body: '* Automated using https://github.com/myii/ssf-formula/pull/95'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
Expand Down
6 changes: 5 additions & 1 deletion ssf/files/default/kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-')
{%- endif %}
{#- Use the appropriate bootstrap options for pre-salted images vs. bootstrapped images #}
{%- set bootstrap_options = 'XdPbfrq' if pre_salted else 'XdPfq' %}
{#- Use the appropriate bootstrap method depending on the Salt version #}
{%- set bootstrap_method = 'git' if salt_ver in ['master', 'develop'] else 'stable' %}
{%- do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %}
{%- do prov_cmds.append('- sh bootstrap-salt.sh -{0} -x python{1} git {2}'.format(bootstrap_options, py_ver, salt_ver)) %}
{%- do prov_cmds.append('- sh bootstrap-salt.sh -{0} -x python{1} {2} {3}'.format(
bootstrap_options, py_ver, bootstrap_method, salt_ver
)) %}
{#- Add formula-specific provision commands #}
{%- if semrel_formula == 'deepsea' %}
{%- if os in ['centos', 'fedora'] %}
Expand Down

0 comments on commit 3bd1091

Please sign in to comment.