Skip to content

Commit 0bbe686

Browse files
javierbertolimyii
javierbertoli
authored and
myii
committed
ci(kitchen+ci): include passenger suite [skip ci]
* Automated using myii/ssf-formula#303
1 parent 1d9a15f commit 0bbe686

File tree

5 files changed

+98
-16
lines changed

5 files changed

+98
-16
lines changed

‎.gitlab-ci.yml‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,45 @@ rubocop:
133133
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
134134
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
135135
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
136-
default-debian-10-master-py3: {extends: '.test_instance'}
137-
default-debian-9-master-py3: {extends: '.test_instance'}
138-
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
139-
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
136+
# default-debian-10-master-py3: {extends: '.test_instance'}
137+
# passenger-debian-10-master-py3: {extends: '.test_instance'}
138+
debian-10-master-py3: {extends: '.test_instance'}
139+
# default-debian-9-master-py3: {extends: '.test_instance'}
140+
# passenger-debian-9-master-py3: {extends: '.test_instance'}
141+
debian-9-master-py3: {extends: '.test_instance'}
142+
# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
143+
# passenger-ubuntu-2004-master-py3: {extends: '.test_instance'}
144+
ubuntu-2004-master-py3: {extends: '.test_instance'}
145+
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
146+
# passenger-ubuntu-1804-master-py3: {extends: '.test_instance'}
147+
ubuntu-1804-master-py3: {extends: '.test_instance'}
140148
default-ubuntu-1604-master-py3: {extends: '.test_instance'}
141-
default-centos-8-master-py3: {extends: '.test_instance'}
142-
default-centos-7-master-py3: {extends: '.test_instance'}
149+
# ubuntu-1604-master-py3: {extends: '.test_instance'}
150+
# default-centos-8-master-py3: {extends: '.test_instance'}
151+
# passenger-centos-8-master-py3: {extends: '.test_instance'}
152+
centos-8-master-py3: {extends: '.test_instance'}
153+
# default-centos-7-master-py3: {extends: '.test_instance'}
154+
# passenger-centos-7-master-py3: {extends: '.test_instance'}
155+
centos-7-master-py3: {extends: '.test_instance'}
143156
default-fedora-33-master-py3: {extends: '.test_instance'}
157+
# fedora-33-master-py3: {extends: '.test_instance'}
144158
default-fedora-32-master-py3: {extends: '.test_instance'}
159+
# fedora-32-master-py3: {extends: '.test_instance'}
145160
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
161+
# opensuse-leap-152-master-py3: {extends: '.test_instance'}
146162
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
163+
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
147164
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
148-
default-oraclelinux-8-master-py3: {extends: '.test_instance'}
165+
# amazonlinux-2-master-py3: {extends: '.test_instance'}
166+
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
167+
# passenger-oraclelinux-8-master-py3: {extends: '.test_instance'}
168+
oraclelinux-8-master-py3: {extends: '.test_instance'}
149169
default-oraclelinux-7-master-py3: {extends: '.test_instance'}
170+
# oraclelinux-7-master-py3: {extends: '.test_instance'}
150171
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
172+
# gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
151173
default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
174+
# gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
152175
# default-debian-10-3002-5-py3: {extends: '.test_instance'}
153176
# default-debian-9-3002-5-py3: {extends: '.test_instance'}
154177
# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
@@ -162,6 +185,7 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
162185
# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
163186
# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
164187
default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
188+
# arch-base-latest-3002-5-py3: {extends: '.test_instance'}
165189
# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
166190
# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
167191
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}

‎.travis.yml‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,45 @@ jobs:
104104
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
105105
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
106106
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
107-
- env: INSTANCE=default-debian-10-master-py3
108-
- env: INSTANCE=default-debian-9-master-py3
109-
- env: INSTANCE=default-ubuntu-2004-master-py3
110-
- env: INSTANCE=default-ubuntu-1804-master-py3
107+
# - env: INSTANCE=default-debian-10-master-py3
108+
# - env: INSTANCE=passenger-debian-10-master-py3
109+
- env: INSTANCE=debian-10-master-py3
110+
# - env: INSTANCE=default-debian-9-master-py3
111+
# - env: INSTANCE=passenger-debian-9-master-py3
112+
- env: INSTANCE=debian-9-master-py3
113+
# - env: INSTANCE=default-ubuntu-2004-master-py3
114+
# - env: INSTANCE=passenger-ubuntu-2004-master-py3
115+
- env: INSTANCE=ubuntu-2004-master-py3
116+
# - env: INSTANCE=default-ubuntu-1804-master-py3
117+
# - env: INSTANCE=passenger-ubuntu-1804-master-py3
118+
- env: INSTANCE=ubuntu-1804-master-py3
111119
- env: INSTANCE=default-ubuntu-1604-master-py3
112-
- env: INSTANCE=default-centos-8-master-py3
113-
- env: INSTANCE=default-centos-7-master-py3
120+
# - env: INSTANCE=ubuntu-1604-master-py3
121+
# - env: INSTANCE=default-centos-8-master-py3
122+
# - env: INSTANCE=passenger-centos-8-master-py3
123+
- env: INSTANCE=centos-8-master-py3
124+
# - env: INSTANCE=default-centos-7-master-py3
125+
# - env: INSTANCE=passenger-centos-7-master-py3
126+
- env: INSTANCE=centos-7-master-py3
114127
- env: INSTANCE=default-fedora-33-master-py3
128+
# - env: INSTANCE=fedora-33-master-py3
115129
- env: INSTANCE=default-fedora-32-master-py3
130+
# - env: INSTANCE=fedora-32-master-py3
116131
- env: INSTANCE=default-opensuse-leap-152-master-py3
132+
# - env: INSTANCE=opensuse-leap-152-master-py3
117133
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
134+
# - env: INSTANCE=opensuse-tmbl-latest-master-py3
118135
- env: INSTANCE=default-amazonlinux-2-master-py3
119-
- env: INSTANCE=default-oraclelinux-8-master-py3
136+
# - env: INSTANCE=amazonlinux-2-master-py3
137+
# - env: INSTANCE=default-oraclelinux-8-master-py3
138+
# - env: INSTANCE=passenger-oraclelinux-8-master-py3
139+
- env: INSTANCE=oraclelinux-8-master-py3
120140
- env: INSTANCE=default-oraclelinux-7-master-py3
141+
# - env: INSTANCE=oraclelinux-7-master-py3
121142
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
143+
# - env: INSTANCE=gentoo-stage3-latest-master-py3
122144
- env: INSTANCE=default-gentoo-stage3-systemd-master-py3
145+
# - env: INSTANCE=gentoo-stage3-systemd-master-py3
123146
# - env: INSTANCE=default-debian-10-3002-5-py3
124147
# - env: INSTANCE=default-debian-9-3002-5-py3
125148
# - env: INSTANCE=default-ubuntu-2004-3002-5-py3
@@ -133,6 +156,7 @@ jobs:
133156
# - env: INSTANCE=default-oraclelinux-8-3002-5-py3
134157
# - env: INSTANCE=default-oraclelinux-7-3002-5-py3
135158
- env: INSTANCE=default-arch-base-latest-3002-5-py3
159+
# - env: INSTANCE=arch-base-latest-3002-5-py3
136160
# - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3
137161
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3
138162
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3

‎.yamllint‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ ignore: |
1414
.cache/
1515
.git/
1616
node_modules/
17-
test/salt/**/*.sls
17+
test/**/states/**/*.sls
1818
.kitchen/
19+
test/salt/passenger/pillar/nginx.sls
1920
2021
yaml-files:
2122
# Default settings

‎kitchen.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,3 +323,27 @@ suites:
323323
verifier:
324324
inspec_tests:
325325
- path: test/integration/default
326+
- name: passenger
327+
includes:
328+
- debian-10-master-py3
329+
- debian-9-master-py3
330+
- ubuntu-2004-master-py3
331+
- ubuntu-1804-master-py3
332+
- centos-8-master-py3
333+
- centos-7-master-py3
334+
- oraclelinux-8-master-py3
335+
provisioner:
336+
state_top:
337+
base:
338+
'*':
339+
- nginx.passenger
340+
pillars:
341+
top.sls:
342+
base:
343+
'*':
344+
- nginx
345+
pillars_from_files:
346+
nginx.sls: test/salt/passenger/pillar/nginx.sls
347+
verifier:
348+
inspec_tests:
349+
- path: test/integration/passenger

‎test/integration/passenger/inspec.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=yaml
33
---
4-
name: default
4+
name: passenger
55
title: nginx formula
66
maintainer: SaltStack Formulas
77
license: Apache-2.0
@@ -10,3 +10,12 @@ supports:
1010
- platform-name: debian
1111
- platform-name: ubuntu
1212
- platform-name: centos
13+
- platform-name: fedora
14+
- platform-name: opensuse
15+
- platform-name: suse
16+
- platform-name: freebsd
17+
- platform-name: amazon
18+
- platform-name: oracle
19+
- platform-name: arch
20+
- platform-name: gentoo
21+
- platform: windows

0 commit comments

Comments
 (0)