Skip to content

Commit 6f04b31

Browse files
myiimyii
committed
ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]
* Automated using myii/ssf-formula#293
1 parent e976ee9 commit 6f04b31

File tree

4 files changed

+351
-103
lines changed

4 files changed

+351
-103
lines changed

Diff for: ‎.gitlab-ci.yml

+69-25
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'}
139+
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
140+
# default-ubuntu-1604-master-py3: {extends: '.test_instance'}
129141
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'}
130144
default-fedora-32-master-py3: {extends: '.test_instance'}
131-
# default-fedora-31-master-py3: {extends: '.test_instance'}
132145
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
146+
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
133147
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'}
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`

Diff for: ‎.travis.yml

+69-25
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
99+
- env: INSTANCE=default-ubuntu-1804-master-py3
100+
# - env: INSTANCE=default-ubuntu-1604-master-py3
89101
- env: INSTANCE=default-centos-8-master-py3
102+
- env: INSTANCE=default-centos-7-master-py3
103+
- env: INSTANCE=default-fedora-33-master-py3
90104
- env: INSTANCE=default-fedora-32-master-py3
91-
# - env: INSTANCE=default-fedora-31-master-py3
92105
- env: INSTANCE=default-opensuse-leap-152-master-py3
106+
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
93107
- 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
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'

0 commit comments

Comments
 (0)