Skip to content

Commit e7230c8

Browse files
Yoda-BZHYoda-BZH
authored
Merge branch 'saltstack-formulas:master' into fix-deb-build-nopillar-uri
2 parents becd5ba + e042413 commit e7230c8

File tree

5 files changed

+389
-464
lines changed

5 files changed

+389
-464
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 & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -222,77 +222,60 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
222222
# archive-rockylinux-8-master-py3: {extends: '.test_instance'}
223223
# source-rockylinux-8-master-py3: {extends: '.test_instance'}
224224
# repo-rockylinux-8-master-py3: {extends: '.test_instance'}
225-
# default-debian-11-3003-2-py3: {extends: '.test_instance'}
226-
# default-debian-10-3003-2-py3: {extends: '.test_instance'}
227-
# default-debian-9-3003-2-py3: {extends: '.test_instance'}
228-
# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
229-
# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
230-
# default-centos-8-3003-2-py3: {extends: '.test_instance'}
231-
# default-centos-7-3003-2-py3: {extends: '.test_instance'}
232-
# default-fedora-34-3003-2-py3: {extends: '.test_instance'}
233-
# default-fedora-33-3003-2-py3: {extends: '.test_instance'}
234-
# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
235-
# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
236-
# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
237-
# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
238-
# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
239-
# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
240-
# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
241-
# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
242-
# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
243-
# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
244-
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
245-
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
246-
# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
247-
# default-debian-11-3002-6-py3: {extends: '.test_instance'}
248-
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
249-
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
250-
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
251-
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
252-
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
253-
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
254-
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
255-
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
256-
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
257-
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
258-
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
259-
# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
260-
# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
261-
# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
262-
# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
263-
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
264-
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
265-
# default-debian-10-3001-7-py3: {extends: '.test_instance'}
266-
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
267-
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
268-
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
269-
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
270-
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
271-
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
272-
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
273-
# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
274-
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
275-
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
276-
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
277-
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
278-
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
279-
# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
280-
# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
281-
# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
282-
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
283-
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
284-
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
285-
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
286-
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
287-
# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
288-
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
289-
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
290-
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
291-
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
292-
# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
293-
# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
294-
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
295-
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
225+
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
226+
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
227+
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
228+
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
229+
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
230+
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
231+
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
232+
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
233+
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
234+
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
235+
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
236+
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
237+
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
238+
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
239+
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
240+
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
241+
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
242+
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
243+
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
244+
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
245+
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
246+
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
247+
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
248+
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
249+
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
250+
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
251+
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
252+
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
253+
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
254+
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
255+
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
256+
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
257+
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
258+
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
259+
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
260+
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
261+
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
262+
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
263+
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
264+
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
265+
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
266+
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
267+
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
268+
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
269+
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
270+
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
271+
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
272+
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
273+
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
274+
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
275+
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
276+
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
277+
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
278+
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
296279

297280
###############################################################################
298281
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 54 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -175,77 +175,60 @@ jobs:
175175
# - env: INSTANCE=archive-rockylinux-8-master-py3
176176
# - env: INSTANCE=source-rockylinux-8-master-py3
177177
# - env: INSTANCE=repo-rockylinux-8-master-py3
178-
# - env: INSTANCE=default-debian-11-3003-2-py3
179-
# - env: INSTANCE=default-debian-10-3003-2-py3
180-
# - env: INSTANCE=default-debian-9-3003-2-py3
181-
# - env: INSTANCE=default-ubuntu-2004-3003-2-py3
182-
# - env: INSTANCE=default-ubuntu-1804-3003-2-py3
183-
# - env: INSTANCE=default-centos-8-3003-2-py3
184-
# - env: INSTANCE=default-centos-7-3003-2-py3
185-
# - env: INSTANCE=default-fedora-34-3003-2-py3
186-
# - env: INSTANCE=default-fedora-33-3003-2-py3
187-
# - env: INSTANCE=default-opensuse-leap-153-3003-2-py3
188-
# - env: INSTANCE=default-opensuse-leap-152-3003-2-py3
189-
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3
190-
# - env: INSTANCE=default-amazonlinux-2-3003-2-py3
191-
# - env: INSTANCE=default-oraclelinux-8-3003-2-py3
192-
# - env: INSTANCE=default-oraclelinux-7-3003-2-py3
193-
# - env: INSTANCE=default-arch-base-latest-3003-2-py3
194-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3
195-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3
196-
# - env: INSTANCE=default-almalinux-8-3003-2-py3
197-
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
198-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
199-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
200-
# - env: INSTANCE=default-debian-11-3002-6-py3
201-
# - env: INSTANCE=default-debian-10-3002-6-py3
202-
# - env: INSTANCE=default-debian-9-3002-6-py3
203-
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
204-
# - env: INSTANCE=default-ubuntu-1804-3002-6-py3
205-
# - env: INSTANCE=default-centos-8-3002-6-py3
206-
# - env: INSTANCE=default-centos-7-3002-6-py3
207-
# - env: INSTANCE=default-fedora-34-3002-6-py3
208-
# - env: INSTANCE=default-fedora-33-3002-6-py3
209-
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
210-
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
211-
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
212-
# - env: INSTANCE=default-arch-base-latest-3002-6-py3
213-
# - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3
214-
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3
215-
# - env: INSTANCE=default-opensuse-leap-153-3002-2-py3
216-
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
217-
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
218-
# - env: INSTANCE=default-debian-10-3001-7-py3
219-
# - env: INSTANCE=default-debian-9-3001-7-py3
220-
# - env: INSTANCE=default-ubuntu-2004-3001-7-py3
221-
# - env: INSTANCE=default-ubuntu-1804-3001-7-py3
222-
# - env: INSTANCE=default-centos-8-3001-7-py3
223-
# - env: INSTANCE=default-centos-7-3001-7-py3
224-
# - env: INSTANCE=default-fedora-34-3001-7-py3
225-
# - env: INSTANCE=default-fedora-33-3001-7-py3
226-
# - env: INSTANCE=default-opensuse-leap-153-3001-7-py3
227-
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
228-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
229-
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
230-
# - env: INSTANCE=default-oraclelinux-8-3001-7-py3
231-
# - env: INSTANCE=default-oraclelinux-7-3001-7-py3
232-
# - env: INSTANCE=default-arch-base-latest-3001-7-py3
233-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3
234-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3
235-
# - env: INSTANCE=default-debian-10-3000-9-py3
236-
# - env: INSTANCE=default-debian-9-3000-9-py3
237-
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
238-
# - env: INSTANCE=default-centos-8-3000-9-py3
239-
# - env: INSTANCE=default-centos-7-3000-9-py3
240-
# - env: INSTANCE=default-opensuse-leap-153-3000-9-py3
241-
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
242-
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
243-
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
244-
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
245-
# - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3
246-
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3
247-
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
248-
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
178+
# - env: INSTANCE=default-debian-11-3003-3-py3
179+
# - env: INSTANCE=default-debian-10-3003-3-py3
180+
# - env: INSTANCE=default-debian-9-3003-3-py3
181+
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
182+
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
183+
# - env: INSTANCE=default-centos-8-3003-3-py3
184+
# - env: INSTANCE=default-centos-7-3003-3-py3
185+
# - env: INSTANCE=default-fedora-34-3003-3-py3
186+
# - env: INSTANCE=default-fedora-33-3003-3-py3
187+
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
188+
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
189+
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
190+
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
191+
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
192+
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
193+
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
194+
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
195+
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
196+
# - env: INSTANCE=default-almalinux-8-3003-3-py3
197+
# - env: INSTANCE=default-debian-11-3002-7-py3
198+
# - env: INSTANCE=default-debian-10-3002-7-py3
199+
# - env: INSTANCE=default-debian-9-3002-7-py3
200+
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
201+
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
202+
# - env: INSTANCE=default-centos-8-3002-7-py3
203+
# - env: INSTANCE=default-centos-7-3002-7-py3
204+
# - env: INSTANCE=default-fedora-34-3002-7-py3
205+
# - env: INSTANCE=default-fedora-33-3002-7-py3
206+
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
207+
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
208+
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
209+
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
210+
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
211+
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
212+
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
213+
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
214+
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
215+
# - env: INSTANCE=default-debian-10-3001-8-py3
216+
# - env: INSTANCE=default-debian-9-3001-8-py3
217+
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
218+
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
219+
# - env: INSTANCE=default-centos-8-3001-8-py3
220+
# - env: INSTANCE=default-centos-7-3001-8-py3
221+
# - env: INSTANCE=default-fedora-34-3001-8-py3
222+
# - env: INSTANCE=default-fedora-33-3001-8-py3
223+
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
224+
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
225+
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
226+
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
227+
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
228+
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
229+
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
230+
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
231+
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
249232

250233
## Define the release stage that runs `semantic-release`
251234
- stage: 'release'

0 commit comments

Comments
 (0)