Skip to content

Commit daa4c9e

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

File tree

4 files changed

+404
-133
lines changed

4 files changed

+404
-133
lines changed

‎.gitlab-ci.yml

Lines changed: 63 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -123,32 +123,70 @@ 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+
# debian-debian-10-tiamat-py3: {extends: '.test_instance'}
127+
# debian-debian-9-tiamat-py3: {extends: '.test_instance'}
128+
# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
129+
# ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
130+
# ubuntu-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
131+
# redhat-centos-8-tiamat-py3: {extends: '.test_instance'}
132+
# redhat-centos-7-tiamat-py3: {extends: '.test_instance'}
133+
# redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
134+
# redhat-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
135+
# redhat-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
126136
debian-debian-10-master-py3: {extends: '.test_instance'}
127-
# ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
128-
# redhat-centos-8-master-py3: {extends: '.test_instance'}
129-
# redhat-fedora-31-master-py3: {extends: '.test_instance'}
130-
# suse-opensuse-leap-151-master-py3: {extends: '.test_instance'}
131-
# redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
132-
# debian-debian-10-2019-2-py3: {extends: '.test_instance'}
133-
# debian-debian-9-2019-2-py3: {extends: '.test_instance'}
134-
ubuntu-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
135-
# redhat-centos-8-2019-2-py3: {extends: '.test_instance'}
136-
# redhat-fedora-31-2019-2-py3: {extends: '.test_instance'}
137-
# suse-opensuse-leap-151-2019-2-py3: {extends: '.test_instance'}
138-
# redhat-centos-7-2019-2-py2: {extends: '.test_instance'}
139-
redhat-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
140-
redhat-fedora-30-2018-3-py3: {extends: '.test_instance'}
141-
# debian-debian-9-2018-3-py2: {extends: '.test_instance'}
142-
# ubuntu-ubuntu-1604-2018-3-py2: {extends: '.test_instance'}
143-
# redhat-centos-7-2018-3-py2: {extends: '.test_instance'}
144-
suse-opensuse-leap-151-2018-3-py2: {extends: '.test_instance'}
145-
# redhat-amazonlinux-1-2018-3-py2: {extends: '.test_instance'}
146-
# debian-debian-8-2017-7-py2: {extends: '.test_instance'}
147-
# ubuntu-ubuntu-1604-2017-7-py2: {extends: '.test_instance'}
148-
# redhat-centos-6-2017-7-py2: {extends: '.test_instance'}
149-
# redhat-fedora-30-2017-7-py2: {extends: '.test_instance'}
150-
# suse-opensuse-leap-151-2017-7-py2: {extends: '.test_instance'}
151-
# redhat-amazonlinux-1-2017-7-py2: {extends: '.test_instance'}
137+
debian-debian-9-master-py3: {extends: '.test_instance'}
138+
ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
139+
ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
140+
ubuntu-ubuntu-1604-master-py3: {extends: '.test_instance'}
141+
redhat-centos-8-master-py3: {extends: '.test_instance'}
142+
redhat-centos-7-master-py3: {extends: '.test_instance'}
143+
redhat-fedora-33-master-py3: {extends: '.test_instance'}
144+
redhat-fedora-32-master-py3: {extends: '.test_instance'}
145+
suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
146+
suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
147+
redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
148+
redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
149+
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
150+
# debian-debian-10-3002-2-py3: {extends: '.test_instance'}
151+
# debian-debian-9-3002-2-py3: {extends: '.test_instance'}
152+
# ubuntu-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
153+
# ubuntu-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
154+
# ubuntu-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
155+
# redhat-centos-8-3002-2-py3: {extends: '.test_instance'}
156+
# redhat-centos-7-3002-2-py3: {extends: '.test_instance'}
157+
# redhat-fedora-33-3002-2-py3: {extends: '.test_instance'}
158+
# redhat-fedora-32-3002-2-py3: {extends: '.test_instance'}
159+
# suse-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
160+
# suse-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
161+
# redhat-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
162+
# redhat-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
163+
# redhat-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
164+
# debian-debian-10-3001-4-py3: {extends: '.test_instance'}
165+
# debian-debian-9-3001-4-py3: {extends: '.test_instance'}
166+
# ubuntu-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
167+
# ubuntu-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
168+
# ubuntu-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
169+
# redhat-centos-8-3001-4-py3: {extends: '.test_instance'}
170+
# redhat-centos-7-3001-4-py3: {extends: '.test_instance'}
171+
# redhat-fedora-33-3001-4-py3: {extends: '.test_instance'}
172+
# redhat-fedora-32-3001-4-py3: {extends: '.test_instance'}
173+
# suse-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
174+
# suse-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
175+
# redhat-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
176+
# redhat-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
177+
# redhat-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
178+
# debian-debian-10-3000-6-py3: {extends: '.test_instance'}
179+
# debian-debian-9-3000-6-py3: {extends: '.test_instance'}
180+
# ubuntu-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
181+
# ubuntu-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
182+
# redhat-centos-8-3000-6-py3: {extends: '.test_instance'}
183+
# redhat-centos-7-3000-6-py3: {extends: '.test_instance'}
184+
# suse-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
185+
# redhat-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
186+
# redhat-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
187+
# redhat-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
188+
# ubuntu-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
189+
# ubuntu-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
152190

153191
###############################################################################
154192
# `release` stage: `semantic-release`

‎.travis.yml

Lines changed: 63 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -83,32 +83,70 @@ 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=debian-debian-10-tiamat-py3
87+
# - env: INSTANCE=debian-debian-9-tiamat-py3
88+
# - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
89+
# - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
90+
# - env: INSTANCE=ubuntu-ubuntu-1604-tiamat-py3
91+
# - env: INSTANCE=redhat-centos-8-tiamat-py3
92+
# - env: INSTANCE=redhat-centos-7-tiamat-py3
93+
# - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3
94+
# - env: INSTANCE=redhat-oraclelinux-8-tiamat-py3
95+
# - env: INSTANCE=redhat-oraclelinux-7-tiamat-py3
8696
- env: INSTANCE=debian-debian-10-master-py3
87-
# - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
88-
# - env: INSTANCE=redhat-centos-8-master-py3
89-
# - env: INSTANCE=redhat-fedora-31-master-py3
90-
# - env: INSTANCE=suse-opensuse-leap-151-master-py3
91-
# - env: INSTANCE=redhat-amazonlinux-2-master-py3
92-
# - env: INSTANCE=debian-debian-10-2019-2-py3
93-
# - env: INSTANCE=debian-debian-9-2019-2-py3
94-
- env: INSTANCE=ubuntu-ubuntu-1804-2019-2-py3
95-
# - env: INSTANCE=redhat-centos-8-2019-2-py3
96-
# - env: INSTANCE=redhat-fedora-31-2019-2-py3
97-
# - env: INSTANCE=suse-opensuse-leap-151-2019-2-py3
98-
# - env: INSTANCE=redhat-centos-7-2019-2-py2
99-
- env: INSTANCE=redhat-amazonlinux-2-2019-2-py3
100-
- env: INSTANCE=redhat-fedora-30-2018-3-py3
101-
# - env: INSTANCE=debian-debian-9-2018-3-py2
102-
# - env: INSTANCE=ubuntu-ubuntu-1604-2018-3-py2
103-
# - env: INSTANCE=redhat-centos-7-2018-3-py2
104-
- env: INSTANCE=suse-opensuse-leap-151-2018-3-py2
105-
# - env: INSTANCE=redhat-amazonlinux-1-2018-3-py2
106-
# - env: INSTANCE=debian-debian-8-2017-7-py2
107-
# - env: INSTANCE=ubuntu-ubuntu-1604-2017-7-py2
108-
# - env: INSTANCE=redhat-centos-6-2017-7-py2
109-
# - env: INSTANCE=redhat-fedora-30-2017-7-py2
110-
# - env: INSTANCE=suse-opensuse-leap-151-2017-7-py2
111-
# - env: INSTANCE=redhat-amazonlinux-1-2017-7-py2
97+
- env: INSTANCE=debian-debian-9-master-py3
98+
- env: INSTANCE=ubuntu-ubuntu-2004-master-py3
99+
- env: INSTANCE=ubuntu-ubuntu-1804-master-py3
100+
- env: INSTANCE=ubuntu-ubuntu-1604-master-py3
101+
- env: INSTANCE=redhat-centos-8-master-py3
102+
- env: INSTANCE=redhat-centos-7-master-py3
103+
- env: INSTANCE=redhat-fedora-33-master-py3
104+
- env: INSTANCE=redhat-fedora-32-master-py3
105+
- env: INSTANCE=suse-opensuse-leap-152-master-py3
106+
- env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
107+
- env: INSTANCE=redhat-amazonlinux-2-master-py3
108+
- env: INSTANCE=redhat-oraclelinux-8-master-py3
109+
- env: INSTANCE=redhat-oraclelinux-7-master-py3
110+
# - env: INSTANCE=debian-debian-10-3002-2-py3
111+
# - env: INSTANCE=debian-debian-9-3002-2-py3
112+
# - env: INSTANCE=ubuntu-ubuntu-2004-3002-2-py3
113+
# - env: INSTANCE=ubuntu-ubuntu-1804-3002-2-py3
114+
# - env: INSTANCE=ubuntu-ubuntu-1604-3002-2-py3
115+
# - env: INSTANCE=redhat-centos-8-3002-2-py3
116+
# - env: INSTANCE=redhat-centos-7-3002-2-py3
117+
# - env: INSTANCE=redhat-fedora-33-3002-2-py3
118+
# - env: INSTANCE=redhat-fedora-32-3002-2-py3
119+
# - env: INSTANCE=suse-opensuse-leap-152-3002-2-py3
120+
# - env: INSTANCE=suse-opensuse-tmbl-latest-3002-2-py3
121+
# - env: INSTANCE=redhat-amazonlinux-2-3002-2-py3
122+
# - env: INSTANCE=redhat-oraclelinux-8-3002-2-py3
123+
# - env: INSTANCE=redhat-oraclelinux-7-3002-2-py3
124+
# - env: INSTANCE=debian-debian-10-3001-4-py3
125+
# - env: INSTANCE=debian-debian-9-3001-4-py3
126+
# - env: INSTANCE=ubuntu-ubuntu-2004-3001-4-py3
127+
# - env: INSTANCE=ubuntu-ubuntu-1804-3001-4-py3
128+
# - env: INSTANCE=ubuntu-ubuntu-1604-3001-4-py3
129+
# - env: INSTANCE=redhat-centos-8-3001-4-py3
130+
# - env: INSTANCE=redhat-centos-7-3001-4-py3
131+
# - env: INSTANCE=redhat-fedora-33-3001-4-py3
132+
# - env: INSTANCE=redhat-fedora-32-3001-4-py3
133+
# - env: INSTANCE=suse-opensuse-leap-152-3001-4-py3
134+
# - env: INSTANCE=suse-opensuse-tmbl-latest-3001-4-py3
135+
# - env: INSTANCE=redhat-amazonlinux-2-3001-4-py3
136+
# - env: INSTANCE=redhat-oraclelinux-8-3001-4-py3
137+
# - env: INSTANCE=redhat-oraclelinux-7-3001-4-py3
138+
# - env: INSTANCE=debian-debian-10-3000-6-py3
139+
# - env: INSTANCE=debian-debian-9-3000-6-py3
140+
# - env: INSTANCE=ubuntu-ubuntu-1804-3000-6-py3
141+
# - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py3
142+
# - env: INSTANCE=redhat-centos-8-3000-6-py3
143+
# - env: INSTANCE=redhat-centos-7-3000-6-py3
144+
# - env: INSTANCE=suse-opensuse-leap-152-3000-6-py3
145+
# - env: INSTANCE=redhat-amazonlinux-2-3000-6-py3
146+
# - env: INSTANCE=redhat-oraclelinux-8-3000-6-py3
147+
# - env: INSTANCE=redhat-oraclelinux-7-3000-6-py3
148+
# - env: INSTANCE=ubuntu-ubuntu-1804-3000-6-py2
149+
# - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py2
112150

113151
## Define the release stage that runs `semantic-release`
114152
- stage: 'release'

0 commit comments

Comments
 (0)