Skip to content

Commit e998a04

Browse files
myiimyii
authored
Merge pull request #84 from myii/update-pre-salted-images/2021-W06b
ci(kitchen+gitlab-ci): use latest pre-salted images (inc. fixes and tests)
2 parents 90eb116 + ae579a7 commit e998a04

7 files changed

Lines changed: 598 additions & 133 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 73 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -123,37 +123,81 @@ rubocop:
123123
## Define the rest of the matrix based on Kitchen testing
124124
# Make sure the instances listed below match up with
125125
# the `platforms` defined in `kitchen.yml`
126+
# default-debian-10-tiamat-py3: {extends: '.test_instance'}
127+
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
128+
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
129+
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
130+
# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
131+
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
132+
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
133+
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
134+
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
135+
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
126136
default-debian-10-master-py3: {extends: '.test_instance'}
137+
default-debian-9-master-py3: {extends: '.test_instance'}
127138
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
128-
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
129-
# default-centos-8-master-py3: {extends: '.test_instance'}
130-
# default-fedora-32-master-py3: {extends: '.test_instance'}
131-
# default-fedora-31-master-py3: {extends: '.test_instance'}
132-
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
133-
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
134-
# default-debian-10-3000-3-py3: {extends: '.test_instance'}
135-
default-debian-9-3000-3-py3: {extends: '.test_instance'}
136-
default-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
137-
# default-centos-8-3000-3-py3: {extends: '.test_instance'}
138-
# default-centos-7-3000-3-py3: {extends: '.test_instance'}
139-
# default-fedora-31-3000-3-py3: {extends: '.test_instance'}
140-
# default-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
141-
# default-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
142-
# default-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
143-
# default-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
144-
# default-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
145-
# default-debian-10-2019-2-py3: {extends: '.test_instance'}
146-
# default-debian-9-2019-2-py3: {extends: '.test_instance'}
147-
# default-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
148-
default-ubuntu-1604-2019-2-py3: {extends: '.test_instance'}
149-
# default-centos-8-2019-2-py3: {extends: '.test_instance'}
150-
# default-centos-7-2019-2-py3: {extends: '.test_instance'}
151-
# default-fedora-31-2019-2-py3: {extends: '.test_instance'}
152-
# default-opensuse-leap-152-2019-2-py3: {extends: '.test_instance'}
153-
# default-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
154-
# default-centos-6-2019-2-py2: {extends: '.test_instance'}
155-
# default-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
156-
# default-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
139+
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
140+
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'}
143+
default-fedora-33-master-py3: {extends: '.test_instance'}
144+
default-fedora-32-master-py3: {extends: '.test_instance'}
145+
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
146+
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
147+
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
148+
default-oraclelinux-8-master-py3: {extends: '.test_instance'}
149+
default-oraclelinux-7-master-py3: {extends: '.test_instance'}
150+
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
151+
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
152+
# default-debian-10-3002-2-py3: {extends: '.test_instance'}
153+
# default-debian-9-3002-2-py3: {extends: '.test_instance'}
154+
# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
155+
# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
156+
# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
157+
# default-centos-8-3002-2-py3: {extends: '.test_instance'}
158+
# default-centos-7-3002-2-py3: {extends: '.test_instance'}
159+
# default-fedora-33-3002-2-py3: {extends: '.test_instance'}
160+
# default-fedora-32-3002-2-py3: {extends: '.test_instance'}
161+
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
162+
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
163+
# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
164+
# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
165+
# default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
166+
default-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
167+
# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
168+
# default-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
169+
# default-debian-10-3001-4-py3: {extends: '.test_instance'}
170+
# default-debian-9-3001-4-py3: {extends: '.test_instance'}
171+
# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
172+
# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
173+
# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
174+
# default-centos-8-3001-4-py3: {extends: '.test_instance'}
175+
# default-centos-7-3001-4-py3: {extends: '.test_instance'}
176+
# default-fedora-33-3001-4-py3: {extends: '.test_instance'}
177+
# default-fedora-32-3001-4-py3: {extends: '.test_instance'}
178+
# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
179+
# default-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
180+
# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
181+
# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
182+
# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
183+
# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
184+
# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
185+
# default-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
186+
# default-debian-10-3000-6-py3: {extends: '.test_instance'}
187+
# default-debian-9-3000-6-py3: {extends: '.test_instance'}
188+
# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
189+
# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
190+
# default-centos-8-3000-6-py3: {extends: '.test_instance'}
191+
# default-centos-7-3000-6-py3: {extends: '.test_instance'}
192+
# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
193+
# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
194+
# default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
195+
# default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
196+
# default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
197+
# default-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
198+
# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
199+
# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
200+
# default-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
157201

158202
###############################################################################
159203
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 73 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -83,37 +83,81 @@ jobs:
8383
## Define the rest of the matrix based on Kitchen testing
8484
# Make sure the instances listed below match up with
8585
# the `platforms` defined in `kitchen.yml`
86+
# - env: INSTANCE=default-debian-10-tiamat-py3
87+
# - env: INSTANCE=default-debian-9-tiamat-py3
88+
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
89+
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
90+
# - env: INSTANCE=default-ubuntu-1604-tiamat-py3
91+
# - env: INSTANCE=default-centos-8-tiamat-py3
92+
# - env: INSTANCE=default-centos-7-tiamat-py3
93+
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
94+
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
95+
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
8696
- env: INSTANCE=default-debian-10-master-py3
97+
- env: INSTANCE=default-debian-9-master-py3
8798
- env: INSTANCE=default-ubuntu-2004-master-py3
88-
# - env: INSTANCE=default-ubuntu-1804-master-py3
89-
# - env: INSTANCE=default-centos-8-master-py3
90-
# - env: INSTANCE=default-fedora-32-master-py3
91-
# - env: INSTANCE=default-fedora-31-master-py3
92-
# - env: INSTANCE=default-opensuse-leap-152-master-py3
93-
# - env: INSTANCE=default-amazonlinux-2-master-py3
94-
# - env: INSTANCE=default-debian-10-3000-3-py3
95-
- env: INSTANCE=default-debian-9-3000-3-py3
96-
- env: INSTANCE=default-ubuntu-1804-3000-3-py3
97-
# - env: INSTANCE=default-centos-8-3000-3-py3
98-
# - env: INSTANCE=default-centos-7-3000-3-py3
99-
# - env: INSTANCE=default-fedora-31-3000-3-py3
100-
# - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
101-
# - env: INSTANCE=default-amazonlinux-2-3000-3-py3
102-
# - env: INSTANCE=default-ubuntu-1804-3000-3-py2
103-
# - env: INSTANCE=default-ubuntu-1604-3000-3-py2
104-
# - env: INSTANCE=default-arch-base-latest-3000-3-py2
105-
# - env: INSTANCE=default-debian-10-2019-2-py3
106-
# - env: INSTANCE=default-debian-9-2019-2-py3
107-
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
108-
- env: INSTANCE=default-ubuntu-1604-2019-2-py3
109-
# - env: INSTANCE=default-centos-8-2019-2-py3
110-
# - env: INSTANCE=default-centos-7-2019-2-py3
111-
# - env: INSTANCE=default-fedora-31-2019-2-py3
112-
# - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
113-
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
114-
# - env: INSTANCE=default-centos-6-2019-2-py2
115-
# - env: INSTANCE=default-amazonlinux-1-2019-2-py2
116-
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
99+
- env: INSTANCE=default-ubuntu-1804-master-py3
100+
- env: INSTANCE=default-ubuntu-1604-master-py3
101+
- env: INSTANCE=default-centos-8-master-py3
102+
- env: INSTANCE=default-centos-7-master-py3
103+
- env: INSTANCE=default-fedora-33-master-py3
104+
- env: INSTANCE=default-fedora-32-master-py3
105+
- env: INSTANCE=default-opensuse-leap-152-master-py3
106+
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
107+
- env: INSTANCE=default-amazonlinux-2-master-py3
108+
- env: INSTANCE=default-oraclelinux-8-master-py3
109+
- env: INSTANCE=default-oraclelinux-7-master-py3
110+
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
111+
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
112+
# - env: INSTANCE=default-debian-10-3002-2-py3
113+
# - env: INSTANCE=default-debian-9-3002-2-py3
114+
# - env: INSTANCE=default-ubuntu-2004-3002-2-py3
115+
# - env: INSTANCE=default-ubuntu-1804-3002-2-py3
116+
# - env: INSTANCE=default-ubuntu-1604-3002-2-py3
117+
# - env: INSTANCE=default-centos-8-3002-2-py3
118+
# - env: INSTANCE=default-centos-7-3002-2-py3
119+
# - env: INSTANCE=default-fedora-33-3002-2-py3
120+
# - env: INSTANCE=default-fedora-32-3002-2-py3
121+
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
122+
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
123+
# - env: INSTANCE=default-amazonlinux-2-3002-2-py3
124+
# - env: INSTANCE=default-oraclelinux-8-3002-2-py3
125+
# - env: INSTANCE=default-oraclelinux-7-3002-2-py3
126+
- env: INSTANCE=default-arch-base-latest-3002-2-py3
127+
# - env: INSTANCE=default-gentoo-stage3-latest-3002-2-py3
128+
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-2-py3
129+
# - env: INSTANCE=default-debian-10-3001-4-py3
130+
# - env: INSTANCE=default-debian-9-3001-4-py3
131+
# - env: INSTANCE=default-ubuntu-2004-3001-4-py3
132+
# - env: INSTANCE=default-ubuntu-1804-3001-4-py3
133+
# - env: INSTANCE=default-ubuntu-1604-3001-4-py3
134+
# - env: INSTANCE=default-centos-8-3001-4-py3
135+
# - env: INSTANCE=default-centos-7-3001-4-py3
136+
# - env: INSTANCE=default-fedora-33-3001-4-py3
137+
# - env: INSTANCE=default-fedora-32-3001-4-py3
138+
# - env: INSTANCE=default-opensuse-leap-152-3001-4-py3
139+
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-4-py3
140+
# - env: INSTANCE=default-amazonlinux-2-3001-4-py3
141+
# - env: INSTANCE=default-oraclelinux-8-3001-4-py3
142+
# - env: INSTANCE=default-oraclelinux-7-3001-4-py3
143+
# - env: INSTANCE=default-arch-base-latest-3001-4-py3
144+
# - env: INSTANCE=default-gentoo-stage3-latest-3001-4-py3
145+
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-4-py3
146+
# - env: INSTANCE=default-debian-10-3000-6-py3
147+
# - env: INSTANCE=default-debian-9-3000-6-py3
148+
# - env: INSTANCE=default-ubuntu-1804-3000-6-py3
149+
# - env: INSTANCE=default-ubuntu-1604-3000-6-py3
150+
# - env: INSTANCE=default-centos-8-3000-6-py3
151+
# - env: INSTANCE=default-centos-7-3000-6-py3
152+
# - env: INSTANCE=default-opensuse-leap-152-3000-6-py3
153+
# - env: INSTANCE=default-amazonlinux-2-3000-6-py3
154+
# - env: INSTANCE=default-oraclelinux-8-3000-6-py3
155+
# - env: INSTANCE=default-oraclelinux-7-3000-6-py3
156+
# - env: INSTANCE=default-gentoo-stage3-latest-3000-6-py3
157+
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-6-py3
158+
# - env: INSTANCE=default-ubuntu-1804-3000-6-py2
159+
# - env: INSTANCE=default-ubuntu-1604-3000-6-py2
160+
# - env: INSTANCE=default-arch-base-latest-3000-6-py2
117161

118162
## Define the release stage that runs `semantic-release`
119163
- stage: 'release'

‎haproxy/config.sls‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,30 @@
22
33
{% set config_file = salt['pillar.get']('haproxy:config_file_path', haproxy.config_file) %}
44
haproxy.config:
5-
file.managed:
6-
- name: {{ config_file }}
7-
- source: {{ haproxy.config_file_source }}
8-
- template: jinja
9-
- user: {{ haproxy.user }}
10-
- group: {{ haproxy.group }}
11-
- mode: 644
12-
- require_in:
13-
- service: haproxy.service
14-
- watch_in:
15-
- service: haproxy.service
16-
{% if salt['pillar.get']('haproxy:overwrite', default=True) == False %}
17-
- unless:
18-
- test -e {{ config_file }}
19-
{% endif %}
5+
file.managed:
6+
- name: {{ config_file }}
7+
- source: {{ haproxy.config_file_source }}
8+
- template: jinja
9+
- user: {{ haproxy.user }}
10+
- group: {{ haproxy.group }}
11+
- mode: 644
12+
- require_in:
13+
- service: haproxy.service
14+
- watch_in:
15+
- service: haproxy.service
16+
{% if salt['pillar.get']('haproxy:overwrite', default=True) == False %}
17+
- unless:
18+
- test -e {{ config_file }}
19+
{% endif %}
20+
21+
{% if salt['pillar.get']('haproxy:global:chroot:enable', False) and
22+
salt['pillar.get']('haproxy:global:chroot:path', '') %}
23+
haproxy-chroot-directory:
24+
file.directory:
25+
- name: {{ salt['pillar.get']('haproxy:global:chroot:path') }}
26+
- user: {{ haproxy.user }}
27+
- group: {{ haproxy.group }}
28+
- dir_mode: 755
29+
- require_in:
30+
- service: haproxy.service
31+
{% endif %}

‎haproxy/templates/haproxy.jinja‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,10 @@ listen {{ listener.get('name', listener_name) }}
282282
{%- endif %}
283283
{%- if 'reqadds' in listener %}
284284
{%- if listener.reqadds is string %}
285-
reqadd {{ listener.reqadds }}
285+
http-request add-header {{ listener.reqadds }}
286286
{%- else %}
287287
{%- for reqadd in listener.reqadds %}
288-
reqadd {{ reqadd }}
288+
http-request add-header {{ reqadd }}
289289
{%- endfor %}
290290
{%- endif %}
291291
{%- endif %}
@@ -450,7 +450,7 @@ frontend {{ frontend.get('name', frontend_name) }}
450450
{{- render_list_of_dictionaries('reqrep', frontend.reqreps) }}
451451
{%- endif %}
452452
{%- if 'reqadds' in frontend %}
453-
{{- render_list_of_dictionaries('reqadd', frontend.reqadds) }}
453+
{{- render_list_of_dictionaries('http-request add-header', frontend.reqadds) }}
454454
{%- endif %}
455455
{%- if 'redirects' in frontend %}
456456
{{- render_list_of_dictionaries('redirect', frontend.redirects) }}

0 commit comments

Comments
 (0)