Skip to content

Commit d083ff2

Browse files
committed
feat(openvpn): implement Windows testing using kitchen-vagrant
* saltstack-formulas/openvpn-formula#112
1 parent 535ddfd commit d083ff2

File tree

4 files changed

+35
-4
lines changed

4 files changed

+35
-4
lines changed

ssf/defaults.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ ssf_node_anchors:
2222
# An alternative method could be to use:
2323
# `git describe --abbrev=0 --tags`
2424
# yamllint disable rule:line-length
25-
title: 'ci(kitchen+travis): use bootstrapped `amazonlinux-1` images'
26-
body: '* Automated using https://github.com/myii/ssf-formula/pull/94'
25+
title: 'feat(kitchen): implement Windows testing using `kitchen-vagrant`'
26+
body: '* Checked using https://github.com/myii/ssf-formula/pull/81'
2727
# yamllint enable rule:line-length
2828
github:
2929
owner: 'saltstack-formulas'

ssf/files/default/inspec/inspec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ depends:
2626
{%- endif %}
2727
supports:
2828
{%- for platform in suite.inspec_yml.supports %}
29-
- platform-name: {{ platform }}
29+
- {{ 'platform-name' if platform != 'windows' else 'platform' }}: {{ platform }}
3030
{%- endfor %}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# frozen_string_literal: true
2+
3+
source 'https://rubygems.org'
4+
5+
gem 'inspec'
6+
gem 'kitchen-docker', '>= 2.9'
7+
gem 'kitchen-inspec', '>= 1.1'
8+
gem 'kitchen-salt', '>= 0.6.0'
9+
gem 'rspec-retry'
10+
11+
group :vagrant do
12+
gem 'kitchen-vagrant'
13+
end

ssf/formulas.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,17 @@ ssf:
11791179
inspec_yml:
11801180
summary: >-
11811181
Verify that the openvpn formula is setup and configured correctly
1182+
supports:
1183+
- debian
1184+
- ubuntu
1185+
- centos
1186+
- fedora
1187+
- opensuse
1188+
- suse
1189+
- freebsd
1190+
- amazon
1191+
- arch
1192+
- windows
11821193
provisioner:
11831194
pillars_from_files:
11841195
- .sls: 'test/salt/pillar/default.sls'
@@ -1195,7 +1206,14 @@ ssf:
11951206
- [centos , 7 , 2018.3, 2, default]
11961207
- [opensuse/leap, 15.1 , 2018.3, 2, default]
11971208
- [centos , 6 , 2017.7, 2, default]
1198-
travis: *travis_do_not_use_single_job_for_linters
1209+
rubocop:
1210+
Cops:
1211+
Metrics/BlockLength:
1212+
Max: 36
1213+
yamllint:
1214+
ignore:
1215+
additional:
1216+
- test/salt/pillar/default.sls
11991217
semrel_files: *semrel_files_default
12001218
php:
12011219
context:

0 commit comments

Comments
 (0)