Skip to content

Commit d3f7833

Browse files
Merge branch 'master' into feature/179582_certbot_via_pip_installeren
2 parents d7402e7 + cfe5c5c commit d3f7833

File tree

6 files changed

+542
-583
lines changed

6 files changed

+542
-583
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ tmp/
127127
# `salt-formula` -- Vagrant Specific files
128128
.vagrant
129129
top.sls
130+
!test/salt/pillar/top.sls
130131

131132
# `suricata-formula` -- Platform binaries
132133
*.rpm

.gitlab-ci.yml

Lines changed: 54 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -174,85 +174,60 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
174174
rpm-almalinux-8-master-py3: {extends: '.test_instance'}
175175
# git-rockylinux-8-master-py3: {extends: '.test_instance'}
176176
rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
177-
# git-debian-11-3003-1-py3: {extends: '.test_instance'}
178-
# git-debian-10-3003-1-py3: {extends: '.test_instance'}
179-
# git-debian-9-3003-1-py3: {extends: '.test_instance'}
180-
# git-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
181-
# git-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
182-
# git-centos-8-3003-1-py3: {extends: '.test_instance'}
183-
# git-centos-7-3003-1-py3: {extends: '.test_instance'}
184-
# git-fedora-34-3003-1-py3: {extends: '.test_instance'}
185-
# git-fedora-33-3003-1-py3: {extends: '.test_instance'}
186-
# git-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
187-
# git-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
188-
# git-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
189-
# git-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
190-
# git-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
191-
# git-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
192-
# git-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
193-
# git-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
194-
# git-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
195-
# git-debian-11-3002-6-py3: {extends: '.test_instance'}
196-
# git-debian-10-3002-6-py3: {extends: '.test_instance'}
197-
# git-debian-9-3002-6-py3: {extends: '.test_instance'}
198-
# git-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
199-
# git-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
200-
# git-centos-8-3002-6-py3: {extends: '.test_instance'}
201-
# git-centos-7-3002-6-py3: {extends: '.test_instance'}
202-
# git-fedora-34-3002-6-py3: {extends: '.test_instance'}
203-
# git-fedora-33-3002-6-py3: {extends: '.test_instance'}
204-
# git-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
205-
# git-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
206-
# git-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
207-
# git-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
208-
# git-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
209-
# git-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
210-
# git-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
211-
# git-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
212-
# git-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
213-
# git-debian-10-3001-7-py3: {extends: '.test_instance'}
214-
# git-debian-9-3001-7-py3: {extends: '.test_instance'}
215-
# git-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
216-
# git-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
217-
# git-centos-8-3001-7-py3: {extends: '.test_instance'}
218-
# git-centos-7-3001-7-py3: {extends: '.test_instance'}
219-
# git-fedora-34-3001-7-py3: {extends: '.test_instance'}
220-
# git-fedora-33-3001-7-py3: {extends: '.test_instance'}
221-
# git-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
222-
# git-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
223-
# git-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
224-
# git-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
225-
# git-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
226-
# git-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
227-
# git-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
228-
# git-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
229-
# git-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
230-
# git-debian-10-3000-9-py3: {extends: '.test_instance'}
231-
# git-debian-9-3000-9-py3: {extends: '.test_instance'}
232-
# git-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
233-
# git-centos-8-3000-9-py3: {extends: '.test_instance'}
234-
# git-centos-7-3000-9-py3: {extends: '.test_instance'}
235-
# git-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
236-
# git-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
237-
# git-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
238-
# git-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
239-
# git-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
240-
# git-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
241-
# git-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
242-
# git-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
243-
# git-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
244-
pip-debian-10-tiamat-py3: {extends: '.test_instance'}
245-
pip-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
246-
pip-debian-11-master-py3: {extends: '.test_instance'}
247-
pip-debian-10-master-py3: {extends: '.test_instance'}
248-
pip-debian-9-master-py3: {extends: '.test_instance'}
249-
pip-ubuntu-2004-master-py3: {extends: '.test_instance'}
250-
pip-centos-8-master-py3: {extends: '.test_instance'}
251-
pip-opensuse-leap-153-master-py3: {extends: '.test_instance'}
252-
pip-opensuse-leap-152-master-py3: {extends: '.test_instance'}
253-
pip-arch-base-latest-master-py3: {extends: '.test_instance'}
254-
pip-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
255-
pip-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
177+
# git-debian-11-3003-3-py3: {extends: '.test_instance'}
178+
# git-debian-10-3003-3-py3: {extends: '.test_instance'}
179+
# git-debian-9-3003-3-py3: {extends: '.test_instance'}
180+
# git-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
181+
# git-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
182+
# git-centos-8-3003-3-py3: {extends: '.test_instance'}
183+
# git-centos-7-3003-3-py3: {extends: '.test_instance'}
184+
# git-fedora-34-3003-3-py3: {extends: '.test_instance'}
185+
# git-fedora-33-3003-3-py3: {extends: '.test_instance'}
186+
# git-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
187+
# git-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
188+
# git-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
189+
# git-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
190+
# git-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
191+
# git-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
192+
# git-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
193+
# git-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
194+
# git-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
195+
# git-almalinux-8-3003-3-py3: {extends: '.test_instance'}
196+
# git-debian-11-3002-7-py3: {extends: '.test_instance'}
197+
# git-debian-10-3002-7-py3: {extends: '.test_instance'}
198+
# git-debian-9-3002-7-py3: {extends: '.test_instance'}
199+
# git-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
200+
# git-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
201+
# git-centos-8-3002-7-py3: {extends: '.test_instance'}
202+
# git-centos-7-3002-7-py3: {extends: '.test_instance'}
203+
# git-fedora-34-3002-7-py3: {extends: '.test_instance'}
204+
# git-fedora-33-3002-7-py3: {extends: '.test_instance'}
205+
# git-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
206+
# git-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
207+
# git-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
208+
# git-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
209+
# git-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
210+
# git-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
211+
# git-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
212+
# git-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
213+
# git-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
214+
# git-debian-10-3001-8-py3: {extends: '.test_instance'}
215+
# git-debian-9-3001-8-py3: {extends: '.test_instance'}
216+
# git-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
217+
# git-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
218+
# git-centos-8-3001-8-py3: {extends: '.test_instance'}
219+
# git-centos-7-3001-8-py3: {extends: '.test_instance'}
220+
# git-fedora-34-3001-8-py3: {extends: '.test_instance'}
221+
# git-fedora-33-3001-8-py3: {extends: '.test_instance'}
222+
# git-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
223+
# git-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
224+
# git-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
225+
# git-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
226+
# git-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
227+
# git-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
228+
# git-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
229+
# git-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
230+
# git-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
256231

257232
###############################################################################
258233
# `release` stage: `semantic-release`

.travis.yml

Lines changed: 54 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -134,85 +134,60 @@ jobs:
134134
- env: INSTANCE=rpm-almalinux-8-master-py3
135135
# - env: INSTANCE=git-rockylinux-8-master-py3
136136
- env: INSTANCE=rpm-rockylinux-8-master-py3
137-
# - env: INSTANCE=git-debian-11-3003-1-py3
138-
# - env: INSTANCE=git-debian-10-3003-1-py3
139-
# - env: INSTANCE=git-debian-9-3003-1-py3
140-
# - env: INSTANCE=git-ubuntu-2004-3003-1-py3
141-
# - env: INSTANCE=git-ubuntu-1804-3003-1-py3
142-
# - env: INSTANCE=git-centos-8-3003-1-py3
143-
# - env: INSTANCE=git-centos-7-3003-1-py3
144-
# - env: INSTANCE=git-fedora-34-3003-1-py3
145-
# - env: INSTANCE=git-fedora-33-3003-1-py3
146-
# - env: INSTANCE=git-opensuse-leap-153-3003-1-py3
147-
# - env: INSTANCE=git-opensuse-leap-152-3003-1-py3
148-
# - env: INSTANCE=git-opensuse-tmbl-latest-3003-1-py3
149-
# - env: INSTANCE=git-amazonlinux-2-3003-1-py3
150-
# - env: INSTANCE=git-oraclelinux-8-3003-1-py3
151-
# - env: INSTANCE=git-oraclelinux-7-3003-1-py3
152-
# - env: INSTANCE=git-arch-base-latest-3003-1-py3
153-
# - env: INSTANCE=git-gentoo-stage3-latest-3003-1-py3
154-
# - env: INSTANCE=git-gentoo-stage3-systemd-3003-1-py3
155-
# - env: INSTANCE=git-debian-11-3002-6-py3
156-
# - env: INSTANCE=git-debian-10-3002-6-py3
157-
# - env: INSTANCE=git-debian-9-3002-6-py3
158-
# - env: INSTANCE=git-ubuntu-2004-3002-6-py3
159-
# - env: INSTANCE=git-ubuntu-1804-3002-6-py3
160-
# - env: INSTANCE=git-centos-8-3002-6-py3
161-
# - env: INSTANCE=git-centos-7-3002-6-py3
162-
# - env: INSTANCE=git-fedora-34-3002-6-py3
163-
# - env: INSTANCE=git-fedora-33-3002-6-py3
164-
# - env: INSTANCE=git-amazonlinux-2-3002-6-py3
165-
# - env: INSTANCE=git-oraclelinux-8-3002-6-py3
166-
# - env: INSTANCE=git-oraclelinux-7-3002-6-py3
167-
# - env: INSTANCE=git-arch-base-latest-3002-6-py3
168-
# - env: INSTANCE=git-gentoo-stage3-latest-3002-6-py3
169-
# - env: INSTANCE=git-gentoo-stage3-systemd-3002-6-py3
170-
# - env: INSTANCE=git-opensuse-leap-153-3002-2-py3
171-
# - env: INSTANCE=git-opensuse-leap-152-3002-2-py3
172-
# - env: INSTANCE=git-opensuse-tmbl-latest-3002-2-py3
173-
# - env: INSTANCE=git-debian-10-3001-7-py3
174-
# - env: INSTANCE=git-debian-9-3001-7-py3
175-
# - env: INSTANCE=git-ubuntu-2004-3001-7-py3
176-
# - env: INSTANCE=git-ubuntu-1804-3001-7-py3
177-
# - env: INSTANCE=git-centos-8-3001-7-py3
178-
# - env: INSTANCE=git-centos-7-3001-7-py3
179-
# - env: INSTANCE=git-fedora-34-3001-7-py3
180-
# - env: INSTANCE=git-fedora-33-3001-7-py3
181-
# - env: INSTANCE=git-opensuse-leap-153-3001-7-py3
182-
# - env: INSTANCE=git-opensuse-leap-152-3001-7-py3
183-
# - env: INSTANCE=git-opensuse-tmbl-latest-3001-7-py3
184-
# - env: INSTANCE=git-amazonlinux-2-3001-7-py3
185-
# - env: INSTANCE=git-oraclelinux-8-3001-7-py3
186-
# - env: INSTANCE=git-oraclelinux-7-3001-7-py3
187-
# - env: INSTANCE=git-arch-base-latest-3001-7-py3
188-
# - env: INSTANCE=git-gentoo-stage3-latest-3001-7-py3
189-
# - env: INSTANCE=git-gentoo-stage3-systemd-3001-7-py3
190-
# - env: INSTANCE=git-debian-10-3000-9-py3
191-
# - env: INSTANCE=git-debian-9-3000-9-py3
192-
# - env: INSTANCE=git-ubuntu-1804-3000-9-py3
193-
# - env: INSTANCE=git-centos-8-3000-9-py3
194-
# - env: INSTANCE=git-centos-7-3000-9-py3
195-
# - env: INSTANCE=git-opensuse-leap-153-3000-9-py3
196-
# - env: INSTANCE=git-opensuse-leap-152-3000-9-py3
197-
# - env: INSTANCE=git-amazonlinux-2-3000-9-py3
198-
# - env: INSTANCE=git-oraclelinux-8-3000-9-py3
199-
# - env: INSTANCE=git-oraclelinux-7-3000-9-py3
200-
# - env: INSTANCE=git-gentoo-stage3-latest-3000-9-py3
201-
# - env: INSTANCE=git-gentoo-stage3-systemd-3000-9-py3
202-
# - env: INSTANCE=git-ubuntu-1804-3000-9-py2
203-
# - env: INSTANCE=git-arch-base-latest-3000-9-py2
204-
- env: INSTANCE=pip-debian-10-tiamat-py3
205-
- env: INSTANCE=pip-ubuntu-2004-tiamat-py3
206-
- env: INSTANCE=pip-debian-11-master-py3
207-
- env: INSTANCE=pip-debian-10-master-py3
208-
- env: INSTANCE=pip-debian-9-master-py3
209-
- env: INSTANCE=pip-ubuntu-2004-master-py3
210-
- env: INSTANCE=pip-centos-8-master-py3
211-
- env: INSTANCE=pip-opensuse-leap-153-master-py3
212-
- env: INSTANCE=pip-opensuse-leap-152-master-py3
213-
- env: INSTANCE=pip-arch-base-latest-master-py3
214-
- env: INSTANCE=pip-gentoo-stage-3-latest-master-py3
215-
- env: INSTANCE=pip-gentoo-stage-3-systemd-master-py3
137+
# - env: INSTANCE=git-debian-11-3003-3-py3
138+
# - env: INSTANCE=git-debian-10-3003-3-py3
139+
# - env: INSTANCE=git-debian-9-3003-3-py3
140+
# - env: INSTANCE=git-ubuntu-2004-3003-3-py3
141+
# - env: INSTANCE=git-ubuntu-1804-3003-3-py3
142+
# - env: INSTANCE=git-centos-8-3003-3-py3
143+
# - env: INSTANCE=git-centos-7-3003-3-py3
144+
# - env: INSTANCE=git-fedora-34-3003-3-py3
145+
# - env: INSTANCE=git-fedora-33-3003-3-py3
146+
# - env: INSTANCE=git-opensuse-leap-153-3003-3-py3
147+
# - env: INSTANCE=git-opensuse-leap-152-3003-3-py3
148+
# - env: INSTANCE=git-opensuse-tmbl-latest-3003-3-py3
149+
# - env: INSTANCE=git-amazonlinux-2-3003-3-py3
150+
# - env: INSTANCE=git-oraclelinux-8-3003-3-py3
151+
# - env: INSTANCE=git-oraclelinux-7-3003-3-py3
152+
# - env: INSTANCE=git-arch-base-latest-3003-3-py3
153+
# - env: INSTANCE=git-gentoo-stage3-latest-3003-3-py3
154+
# - env: INSTANCE=git-gentoo-stage3-systemd-3003-3-py3
155+
# - env: INSTANCE=git-almalinux-8-3003-3-py3
156+
# - env: INSTANCE=git-debian-11-3002-7-py3
157+
# - env: INSTANCE=git-debian-10-3002-7-py3
158+
# - env: INSTANCE=git-debian-9-3002-7-py3
159+
# - env: INSTANCE=git-ubuntu-2004-3002-7-py3
160+
# - env: INSTANCE=git-ubuntu-1804-3002-7-py3
161+
# - env: INSTANCE=git-centos-8-3002-7-py3
162+
# - env: INSTANCE=git-centos-7-3002-7-py3
163+
# - env: INSTANCE=git-fedora-34-3002-7-py3
164+
# - env: INSTANCE=git-fedora-33-3002-7-py3
165+
# - env: INSTANCE=git-opensuse-leap-153-3002-7-py3
166+
# - env: INSTANCE=git-opensuse-leap-152-3002-7-py3
167+
# - env: INSTANCE=git-opensuse-tmbl-latest-3002-7-py3
168+
# - env: INSTANCE=git-amazonlinux-2-3002-7-py3
169+
# - env: INSTANCE=git-oraclelinux-8-3002-7-py3
170+
# - env: INSTANCE=git-oraclelinux-7-3002-7-py3
171+
# - env: INSTANCE=git-arch-base-latest-3002-7-py3
172+
# - env: INSTANCE=git-gentoo-stage3-latest-3002-7-py3
173+
# - env: INSTANCE=git-gentoo-stage3-systemd-3002-7-py3
174+
# - env: INSTANCE=git-debian-10-3001-8-py3
175+
# - env: INSTANCE=git-debian-9-3001-8-py3
176+
# - env: INSTANCE=git-ubuntu-2004-3001-8-py3
177+
# - env: INSTANCE=git-ubuntu-1804-3001-8-py3
178+
# - env: INSTANCE=git-centos-8-3001-8-py3
179+
# - env: INSTANCE=git-centos-7-3001-8-py3
180+
# - env: INSTANCE=git-fedora-34-3001-8-py3
181+
# - env: INSTANCE=git-fedora-33-3001-8-py3
182+
# - env: INSTANCE=git-opensuse-leap-153-3001-8-py3
183+
# - env: INSTANCE=git-opensuse-leap-152-3001-8-py3
184+
# - env: INSTANCE=git-opensuse-tmbl-latest-3001-8-py3
185+
# - env: INSTANCE=git-amazonlinux-2-3001-8-py3
186+
# - env: INSTANCE=git-oraclelinux-8-3001-8-py3
187+
# - env: INSTANCE=git-oraclelinux-7-3001-8-py3
188+
# - env: INSTANCE=git-arch-base-latest-3001-8-py3
189+
# - env: INSTANCE=git-gentoo-stage3-latest-3001-8-py3
190+
# - env: INSTANCE=git-gentoo-stage3-systemd-3001-8-py3
216191

217192
## Define the release stage that runs `semantic-release`
218193
- stage: 'release'

Gemfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22

33
source 'https://rubygems.org'
44

5-
# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
6-
# regression where the diff isn't displayed when comparing using `eq`.
7-
gem 'inspec', '~> 4.22.22'
8-
# Install the `kitchen-docker` gem using `git` because the latest version
9-
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
5+
# Install the `inspec` gem using `git` because versions after `4.22.22`
6+
# suppress diff output; this version fixes this for our uses.
7+
# rubocop:disable Layout/LineLength
8+
gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
9+
# rubocop:enable Layout/LineLength
10+
11+
# Install the `kitchen-docker` gem using `git` in order to gain a performance
12+
# improvement: avoid package installations which are already covered by the
13+
# `salt-image-builder` (i.e. the pre-salted images that we're using)
1014
# rubocop:disable Layout/LineLength
1115
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
1216
# rubocop:enable Layout/LineLength
17+
1318
gem 'kitchen-inspec', '>= 2.5.0'
1419
gem 'kitchen-salt', '>= 0.6.3'

0 commit comments

Comments
 (0)