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.

Sign up for GitHub

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(formula): add epel-formula (inc. bootstrapped amazonlinux-1 images) #92

Merged
merged 2 commits into from
Nov 4, 2019
Merged

feat(formula): add epel-formula (inc. bootstrapped amazonlinux-1 images) #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b51be37
feat(kitchen): use bootstrapped `amazonlinux-1` images
myii Nov 4, 2019
2814ea0
feat(formula): add `epel-formula`
myii Oct 31, 2019
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
1 change: 1 addition & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ ssf:
- deepsea
- dhcpd
- docker
- epel
- exim
- fail2ban
- golang
Expand Down
5 changes: 3 additions & 2 deletions ssf/defaults.yaml
View file
Open in desktop
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): use `develop` image until `master` is ready (`amazonlinux`) [skip ci]'
body: '* Automated using https://github.com/myii/ssf-formula/pull/93'
title: 'feat(semantic-release): implement for this formula'
body: '* Automated using https://github.com/myii/ssf-formula/pull/92'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -269,6 +269,7 @@ ssf:
deepsea: *formula_default
dhcpd: *formula_default
docker: *formula_default
epel: *formula_default
exim: *formula_default
fail2ban: *formula_default
golang: *formula_default
Expand Down
20 changes: 16 additions & 4 deletions ssf/files/default/kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@
{%- if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
{%- set salt_ver = 'develop' %}
{%- endif %}
{#- Use bootstrapped images for `amazonlinux-1` #}
{%- if [os, os_ver] == ['amazonlinux', 1] %}
image: {{ os }}:{{ os_ver }}
{%- else %}
image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') }}-{{ os_ver }}
{%- endif %}
{%- endfilter %}
{%- endmacro %}

Expand All @@ -69,8 +74,11 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-')
{%- if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
{%- set salt_ver = 'develop' %}
{%- endif %}
{%- do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %}
{%- do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %}
{#- Append the `prov_cmds` for pre-salted images (i.e. non-bootstrap) #}
{%- if [os, os_ver] != ['amazonlinux', 1] %}
{%- do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %}
{%- do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %}
{%- endif %}
{%- if semrel_formula == 'deepsea' %}
{%- if os in ['centos', 'fedora'] %}
{%- do prov_cmds.append('- yum install make -y') %}
Expand Down Expand Up @@ -105,7 +113,7 @@ provision_command:
{%- filter indent(6) %}
{%- if os in ['opensuse/leap', 'arch-base'] %}
run_command: /usr/lib/systemd/systemd
{%- elif [os, os_ver] == ['centos', 6] %}
{%- elif [os, os_ver] in [['amazonlinux', 1], ['centos', 6]] %}
run_command: /sbin/init
{%- endif %}
{%- endfilter %}
Expand Down Expand Up @@ -170,7 +178,11 @@ platforms:
{{- format_driver_image(os, os_ver, salt_ver, py_ver) }}
{{- format_driver_prov_cmds(os, os_ver, salt_ver, py_ver) }}
{{- format_driver_run_cmds(os, os_ver) }}
{%- if [os, os_ver] == ['opensuse/leap', 15.1] %}
{%- if [os, os_ver] == ['amazonlinux', 1] %}
provisioner:
salt_bootstrap_options: -XdPfq -x python{{ py_ver }} git {{ salt_ver }}
salt_install: bootstrap
{%- elif [os, os_ver] == ['opensuse/leap', 15.1] %}
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
Expand Down
1 change: 1 addition & 0 deletions ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ These formulas are already compatible with semantic-release:
* `deepsea-formula <https://github.com/saltstack-formulas/deepsea-formula>`_
* `dhcpd-formula <https://github.com/saltstack-formulas/dhcpd-formula>`_
* `docker-formula <https://github.com/saltstack-formulas/docker-formula>`_
* `epel-formula <https://github.com/saltstack-formulas/epel-formula>`_
* `exim-formula <https://github.com/saltstack-formulas/exim-formula>`_
* `fail2ban-formula <https://github.com/saltstack-formulas/fail2ban-formula>`_
* `golang-formula <https://github.com/saltstack-formulas/golang-formula>`_
Expand Down
48 changes: 48 additions & 0 deletions ssf/formulas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ ssf_node_anchors:
- centos
- fedora
- opensuse
supports_centos_fedora_amazon: &supports_centos_fedora_amazon
- centos
- fedora
- amazon
provisioner:
state_top_salt: &state_top_salt
- '*':
Expand Down Expand Up @@ -560,6 +564,50 @@ ssf:
additional:
- docker/osfamilymap.yaml
semrel_files: *semrel_files_default
epel:
context:
git:
github:
repo: 'epel-formula'
inspec_suites_kitchen:
0:
inspec_yml:
summary: >-
Verify that the epel formula is setup and configured correctly
supports: *supports_centos_fedora_amazon
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]
- [amazonlinux , 1 , master, 2]
- [centos , 8 , master, 3]
- [fedora , 31 , master, 3]
- [amazonlinux , 2 , master, 2]
- [amazonlinux , 1 , 2019.2, 2]
- [centos , 8 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 2]
- [centos , 7 , 2019.2, 2]
- [amazonlinux , 1 , 2018.3, 2]
- [fedora , 30 , 2018.3, 3]
- [centos , 7 , 2018.3, 2]
- [amazonlinux , 2 , 2018.3, 2]
- [amazonlinux , 1 , 2017.7, 2]
- [centos , 6 , 2017.7, 2]
- [fedora , 30 , 2017.7, 2]
- [amazonlinux , 2 , 2017.7, 2]
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [centos , 8 , master, 3, default]
# - [fedora , 31 , master, 3, default]
- [amazonlinux , 1 , 2019.2, 2, default]
- [amazonlinux , 2 , 2019.2, 2, default]
- [centos , 7 , 2019.2, 2, default]
# - [fedora , 30 , 2018.3, 3, default]
- [centos , 6 , 2017.7, 2, default]
semrel_files: *semrel_files_default
exim:
context:
git:
Expand Down