Skip to content

Commit 1d3b03e

Browse files
authored
Improve tests (#90)
* Update .travis.yml * Create Travis build matrix * Add nginx-modules.yml test playbook to Travis build matrix * Improve template test playbook * Change HTML template variables from Ansible to NGINX variables
1 parent fdfff7e commit 1d3b03e

File tree

5 files changed

+278
-125
lines changed

5 files changed

+278
-125
lines changed

.travis.yml

Lines changed: 190 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -2,124 +2,196 @@
22
sudo: required
33
services:
44
- docker
5-
env:
6-
- distribution: centos
7-
version: 6
8-
playbook: basic
9-
- distribution: centos
10-
version: 6
11-
playbook: push
12-
- distribution: centos
13-
version: 6
14-
playbook: stable
15-
- distribution: centos
16-
version: 6
17-
playbook: template
18-
- distribution: centos
19-
version: 6
20-
playbook: unit
21-
- distribution: centos
22-
version: 7
23-
playbook: basic
24-
- distribution: centos
25-
version: 7
26-
playbook: template
27-
- distribution: centos
28-
version: 7
29-
playbook: stable
30-
- distribution: centos
31-
version: 7
32-
playbook: push
33-
- distribution: centos
34-
version: 7
35-
playbook: unit
36-
- distribution: debian
37-
version: jessie
38-
playbook: basic
39-
- distribution: debian
40-
version: jessie
41-
playbook: template
42-
- distribution: debian
43-
version: jessie
44-
playbook: stable
45-
- distribution: debian
46-
version: jessie
47-
playbook: push
48-
- distribution: debian
49-
version: jessie
50-
playbook: unit
51-
- distribution: debian
52-
version: stretch
53-
playbook: basic
54-
- distribution: debian
55-
version: stretch
56-
playbook: template
57-
- distribution: debian
58-
version: stretch
59-
playbook: stable
60-
- distribution: debian
61-
version: stretch
62-
playbook: push
63-
- distribution: debian
64-
version: stretch
65-
playbook: unit
66-
- distribution: ubuntu
67-
version: trusty
68-
playbook: basic
69-
- distribution: ubuntu
70-
version: trusty
71-
playbook: template
72-
- distribution: ubuntu
73-
version: trusty
74-
playbook: stable
75-
- distribution: ubuntu
76-
version: trusty
77-
playbook: push
78-
- distribution: ubuntu
79-
version: xenial
80-
playbook: basic
81-
- distribution: ubuntu
82-
version: xenial
83-
playbook: template
84-
- distribution: ubuntu
85-
version: xenial
86-
playbook: stable
87-
- distribution: ubuntu
88-
version: xenial
89-
playbook: push
90-
- distribution: ubuntu
91-
version: xenial
92-
playbook: unit
93-
- distribution: ubuntu
94-
version: artful
95-
playbook: basic
96-
- distribution: ubuntu
97-
version: artful
98-
playbook: push
99-
- distribution: ubuntu
100-
version: artful
101-
playbook: stable
102-
- distribution: ubuntu
103-
version: artful
104-
playbook: template
105-
- distribution: ubuntu
106-
version: artful
107-
playbook: unit
108-
- distribution: ubuntu
109-
version: bionic
110-
playbook: basic
111-
- distribution: ubuntu
112-
version: bionic
113-
playbook: push
114-
- distribution: ubuntu
115-
version: bionic
116-
playbook: stable
117-
- distribution: ubuntu
118-
version: bionic
119-
playbook: template
120-
- distribution: ubuntu
121-
version: bionic
122-
playbook: unit
5+
matrix:
6+
include:
7+
- env:
8+
distribution: centos
9+
version: 6
10+
playbook: basic
11+
- env:
12+
distribution: centos
13+
version: 6
14+
playbook: modules
15+
- env:
16+
distribution: centos
17+
version: 6
18+
playbook: push
19+
- env:
20+
distribution: centos
21+
version: 6
22+
playbook: stable
23+
- env:
24+
distribution: centos
25+
version: 6
26+
playbook: template
27+
- env:
28+
distribution: centos
29+
version: 6
30+
playbook: unit
31+
- env:
32+
distribution: centos
33+
version: 7
34+
playbook: basic
35+
- env:
36+
distribution: centos
37+
version: 7
38+
playbook: modules
39+
- env:
40+
distribution: centos
41+
version: 7
42+
playbook: push
43+
- env:
44+
distribution: centos
45+
version: 7
46+
playbook: template
47+
- env:
48+
distribution: centos
49+
version: 7
50+
playbook: stable
51+
- env:
52+
distribution: centos
53+
version: 7
54+
playbook: unit
55+
- env:
56+
distribution: debian
57+
version: jessie
58+
playbook: basic
59+
- env:
60+
distribution: debian
61+
version: jessie
62+
playbook: modules
63+
- env:
64+
distribution: debian
65+
version: jessie
66+
playbook: push
67+
- env:
68+
distribution: debian
69+
version: jessie
70+
playbook: template
71+
- env:
72+
distribution: debian
73+
version: jessie
74+
playbook: stable
75+
- env:
76+
distribution: debian
77+
version: jessie
78+
playbook: unit
79+
- env:
80+
distribution: debian
81+
version: stretch
82+
playbook: basic
83+
- env:
84+
distribution: debian
85+
version: stretch
86+
playbook: modules
87+
- env:
88+
distribution: debian
89+
version: stretch
90+
playbook: push
91+
- env:
92+
distribution: debian
93+
version: stretch
94+
playbook: template
95+
- env:
96+
distribution: debian
97+
version: stretch
98+
playbook: stable
99+
- env:
100+
distribution: debian
101+
version: stretch
102+
playbook: unit
103+
- env:
104+
distribution: ubuntu
105+
version: trusty
106+
playbook: basic
107+
- env:
108+
distribution: ubuntu
109+
version: trusty
110+
playbook: modules
111+
- env:
112+
distribution: ubuntu
113+
version: trusty
114+
playbook: push
115+
- env:
116+
distribution: ubuntu
117+
version: trusty
118+
playbook: template
119+
- env:
120+
distribution: ubuntu
121+
version: trusty
122+
playbook: stable
123+
- env:
124+
distribution: ubuntu
125+
version: xenial
126+
playbook: basic
127+
- env:
128+
distribution: ubuntu
129+
version: xenial
130+
playbook: modules
131+
- env:
132+
distribution: ubuntu
133+
version: xenial
134+
playbook: push
135+
- env:
136+
distribution: ubuntu
137+
version: xenial
138+
playbook: template
139+
- env:
140+
distribution: ubuntu
141+
version: xenial
142+
playbook: stable
143+
- env:
144+
distribution: ubuntu
145+
version: xenial
146+
playbook: unit
147+
- env:
148+
distribution: ubuntu
149+
version: artful
150+
playbook: basic
151+
- env:
152+
distribution: ubuntu
153+
version: artful
154+
playbook: modules
155+
- env:
156+
distribution: ubuntu
157+
version: artful
158+
playbook: push
159+
- env:
160+
distribution: ubuntu
161+
version: artful
162+
playbook: stable
163+
- env:
164+
distribution: ubuntu
165+
version: artful
166+
playbook: template
167+
- env:
168+
distribution: ubuntu
169+
version: artful
170+
playbook: unit
171+
- env:
172+
distribution: ubuntu
173+
version: bionic
174+
playbook: basic
175+
- env:
176+
distribution: ubuntu
177+
version: bionic
178+
playbook: modules
179+
- env:
180+
distribution: ubuntu
181+
version: bionic
182+
playbook: push
183+
- env:
184+
distribution: ubuntu
185+
version: bionic
186+
playbook: stable
187+
- env:
188+
distribution: ubuntu
189+
version: bionic
190+
playbook: template
191+
- env:
192+
distribution: ubuntu
193+
version: bionic
194+
playbook: unit
123195
before_install:
124196
- 'sudo docker pull ${distribution}:${version}'
125197
- 'sudo docker build --no-cache --rm --file=tests/dockerfiles/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'

defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ nginx_main_template:
154154
# Enable creating dynamic templated NGINX HTTP configuration files.
155155
# Defaults will not produce a valid configuration. Instead they are meant to showcase
156156
# the options available for templating. Each key represents a new configuration file.
157-
# Comment out load_balancer or web_server depending on whether you wish to create a web server
158-
# or load balancer configuration file.
159157
nginx_http_template_enable: false
160158
nginx_http_template:
161159
default:

templates/www/index.html.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ clearTimeout(ref);
8181
<img alt="NGINX Logo" src="data:image/png;base64,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"/>
8282
<div class="info">
8383
<p><span>Web Server name:</span> <span> {{ item.value.web_server_name }} </span></p>
84-
<p><span>Server name:</span> <span> {{ ansible_hostname }} </span></p>
85-
<p><span>Server address:</span> <span> {{ ansible_eth0.ipv4.address }} </span></p>
84+
<p><span>Server name:</span> <span>server_hostname</span></p>
85+
<p><span>Server address:</span> <span>server_address</span></p>
8686
<p><span>User Agent:</span> <span><small>client_browser</small></span></p>
8787
<p class="smaller"><span>URI:</span> <span>server_url</span></p>
8888
<p class="smaller"><span>Doc Root:</span> <span>document_root</span></p>

tests/playbooks/nginx-modules.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
- hosts: localhost
3+
become: true
4+
remote_user: root
5+
roles:
6+
- ansible-role-nginx
7+
vars:
8+
nginx_modules:
9+
njs: true
10+
perl: true
11+
waf: false
12+
geoip: true
13+
image_filter: true
14+
rtmp: true
15+
xslt: true

0 commit comments

Comments
 (0)