Skip to content

Commit 4479c26

Browse files
author
Michael Chmielewski
committed
Move integration to use docker, now all platforms work.
1 parent 772c26c commit 4479c26

File tree

2 files changed

+184
-52
lines changed

2 files changed

+184
-52
lines changed

‎.kitchen.yml‎

Lines changed: 169 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,203 @@
11
---
22
driver:
3-
name: vagrant
3+
name: docker
44

55
provisioner:
66
product_name: chef
77
product_version: 14
88

99
platforms:
10-
- name: ubuntu-16.04
10+
- name: amazonlinux-1
1111
attributes:
1212
threatstack:
1313
repo:
14-
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL']: nil %>
15-
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
16-
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
17-
- name: ubuntu-18.04
18-
attributes:
19-
threatstack:
20-
repo:
21-
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL'] : nil %>
22-
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
23-
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
24-
- name: ubuntu-20.04
25-
attributes:
26-
threatstack:
27-
repo:
28-
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL'] : nil %>
29-
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
30-
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
31-
- name: debian-8
32-
attributes:
33-
threatstack:
34-
repo:
35-
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL'] : nil %>
36-
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
37-
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
38-
- name: debian-9
39-
attributes:
40-
threatstack:
41-
repo:
42-
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL'] : nil %>
43-
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
44-
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
45-
- name: debian-10
14+
url: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/amzn1' : nil %>
15+
key_file_uri: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/amzn1/repomd.xml.key' : nil %>
16+
validate_gpg_key: false # This is ONLY for test purposes! Don't do this in your actual roles/recipes
17+
driver_config:
18+
image: amazonlinux:1
19+
run_command: /sbin/init
20+
privileged: true
21+
run_options:
22+
env: container=docker
23+
volume:
24+
- /sys/fs/cgroup:/sys/fs/cgroup
25+
provision_command:
26+
- yum install -y audit initscripts
27+
- sed -i 's/local_events = yes/local_events = no/g' /etc/audit/auditd.conf
28+
- chkconfig auditd on
29+
- name: amazonlinux-2
4630
attributes:
4731
threatstack:
4832
repo:
49-
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL'] : nil %>
50-
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
51-
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
33+
url: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/amzn2' : nil %>
34+
key_file_uri: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/amzn2/repomd.xml.key' : nil %>
35+
validate_gpg_key: false # This is ONLY for test purposes! Don't do this in your actual roles/recipes
36+
driver_config:
37+
image: amazonlinux:2
38+
run_command: /sbin/init
39+
privileged: true
40+
run_options:
41+
env: container=docker
42+
volume:
43+
- /sys/fs/cgroup:/sys/fs/cgroup
44+
provision_command:
45+
- yum install -y audit initscripts
46+
- sed -i 's/local_events = yes/local_events = no/g' /etc/audit/auditd.conf
47+
- systemctl enable auditd.service
48+
image: centos:7
5249
- name: centos-7
5350
attributes:
5451
threatstack:
5552
repo:
5653
url: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/el7' : nil %>
5754
key_file_uri: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/el7/repomd.xml.key' : nil %>
5855
validate_gpg_key: false # This is ONLY for test purposes! Don't do this in your actual roles/recipes
56+
driver_config:
57+
image: centos:7
58+
run_command: /sbin/init
59+
privileged: true
60+
run_options:
61+
env: container=docker
62+
volume:
63+
- /sys/fs/cgroup:/sys/fs/cgroup
64+
provision_command:
65+
- yum install -y audit initscripts
66+
- sed -i 's/local_events = yes/local_events = no/g' /etc/audit/auditd.conf
67+
- systemctl enable auditd.service
5968
- name: centos-8
6069
attributes:
6170
threatstack:
6271
repo:
6372
url: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/el8' : nil %>
6473
key_file_uri: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/el8/repomd.xml.key' : nil %>
6574
validate_gpg_key: false # This is ONLY for test purposes! Don't do this in your actual roles/recipes
66-
- name: amazonlinux-2
75+
driver_config:
76+
image: centos:8
77+
run_command: /sbin/init
78+
privileged: true
79+
run_options:
80+
env: container=docker
81+
volume:
82+
- /sys/fs/cgroup:/sys/fs/cgroup
83+
provision_command:
84+
- yum install -y audit initscripts
85+
- sed -i 's/local_events = yes/local_events = no/g' /etc/audit/auditd.conf
86+
- systemctl enable auditd.service
87+
- name: debian-8
6788
attributes:
6889
threatstack:
6990
repo:
70-
url: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/amzn2' : nil %>
71-
key_file_uri: <%= ENV['TS_RPM_REPO_URL'] != nil ? ENV['TS_RPM_REPO_URL'] + '/amzn2/repomd.xml.key' : nil %>
72-
validate_gpg_key: false # This is ONLY for test purposes! Don't do this in your actual roles/recipes
91+
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL']: nil %>
92+
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
93+
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
94+
driver_config:
95+
image: debian:8
96+
run_command: /sbin/init
97+
cap_add:
98+
- SYS_ADMIN
99+
run_options:
100+
env: container=docker
101+
volume:
102+
- /sys/fs/cgroup:/sys/fs/cgroup
103+
provision_command:
104+
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
105+
- systemctl enable ssh.service
106+
- name: debian-9
107+
threatstack:
108+
repo:
109+
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL']: nil %>
110+
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
111+
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
112+
driver_config:
113+
image: debian:9
114+
run_command: /bin/systemd
115+
cap_add:
116+
- SYS_ADMIN
117+
run_options:
118+
env: container=docker
119+
volume:
120+
- /sys/fs/cgroup:/sys/fs/cgroup
121+
provision_command:
122+
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
123+
- systemctl enable ssh.service
124+
- apt install -y gnupg
125+
- name: debian-10
126+
threatstack:
127+
repo:
128+
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL']: nil %>
129+
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
130+
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
131+
driver_config:
132+
image: debian:10
133+
run_command: /sbin/init
134+
cap_add:
135+
- SYS_ADMIN
136+
run_options:
137+
env: container=docker
138+
volume:
139+
- /sys/fs/cgroup:/sys/fs/cgroup
140+
provision_command:
141+
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
142+
- systemctl enable ssh.service
143+
- apt install -y gnupg
144+
- name: ubuntu-16.04
145+
threatstack:
146+
repo:
147+
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL']: nil %>
148+
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
149+
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
150+
driver_config:
151+
image: ubuntu:16.04
152+
run_command: /sbin/init
153+
cap_add:
154+
- SYS_ADMIN
155+
run_options:
156+
env: container=docker
157+
volume:
158+
- /sys/fs/cgroup:/sys/fs/cgroup
159+
provision_command:
160+
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
161+
- systemctl enable ssh.service
162+
- apt install -y gnupg
163+
- name: ubuntu-18.04
164+
threatstack:
165+
repo:
166+
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL']: nil %>
167+
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
168+
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
169+
driver_config:
170+
image: ubuntu:18.04
171+
run_command: /sbin/init
172+
cap_add:
173+
- SYS_ADMIN
174+
run_options:
175+
env: container=docker
176+
volume:
177+
- /sys/fs/cgroup:/sys/fs/cgroup
178+
provision_command:
179+
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
180+
- systemctl enable ssh.service
181+
- apt install -y gnupg
182+
- name: ubuntu-20.04
183+
threatstack:
184+
repo:
185+
url: <%= ENV['TS_DEB_REPO_URL'] != nil ? ENV['TS_DEB_REPO_URL']: nil %>
186+
key: <%= ENV['TS_DEB_REPO_KEY'] != nil ? ENV['TS_DEB_REPO_KEY'] : nil %>
187+
components: <%= ENV['TS_REPO_COMPONENTS'] != nil ? ENV['TS_REPO_COMPONENTS'] : nil %>
188+
driver_config:
189+
image: ubuntu:20.04
190+
run_command: /sbin/init
191+
cap_add:
192+
- SYS_ADMIN
193+
run_options:
194+
env: container=docker
195+
volume:
196+
- /sys/fs/cgroup:/sys/fs/cgroup
197+
provision_command:
198+
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
199+
- systemctl enable ssh.service
200+
- apt install -y gnupg
73201

74202
suites:
75203
- name: default

‎Gemfile‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
source 'https://rubygems.org'
1+
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
22

3-
gem 'chefspec', '= 7.3.4'
4-
gem 'berkshelf', '= 6.3.1'
5-
gem 'rubocop', '= 0.61.1'
6-
gem 'foodcritic', '= 15.1.0'
7-
gem 'cucumber-core', '= 3.2.1'
8-
gem 'serverspec', '= 2.41.3'
9-
gem 'stove', '= 6.1.1'
10-
gem 'test-kitchen', '= 1.20.0'
11-
gem 'kitchen-vagrant', '= 1.5.0'
12-
gem 'kitchen-ec2'
3+
group :development, :unit_tests , :test do
4+
gem 'rake', "13.0.1", :require => false
5+
gem 'chefspec', '= 7.3.4', :require => false
6+
gem 'berkshelf', '= 6.3.1'
7+
gem 'rubocop', '= 0.61.1'
8+
gem 'foodcritic', '= 15.1.0'
9+
end
10+
11+
group :system_tests do
12+
gem 'serverspec', :require => false
13+
gem 'test-kitchen', :require => false
14+
gem 'kitchen-docker', :require => false
15+
gem 'kitchen-ec2', :require => false
16+
end
1317

1418
if chefversion = ENV['CHEF_VERSION']
1519
gem 'chef', chefversion

0 commit comments

Comments
 (0)