Skip to content

Commit a0fdc61

Browse files
myiimyii
committed
ci(kitchen+gitlab): update for new pre-salted images [skip ci]
* Automated using myii/ssf-formula#279
1 parent f15efd1 commit a0fdc61

3 files changed

Lines changed: 198 additions & 219 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 49 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -134,70 +134,66 @@ rubocop:
134134
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
135135
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
136136
default-debian-10-master-py3: {extends: '.test_instance'}
137-
# default-debian-9-master-py3: {extends: '.test_instance'}
137+
default-debian-9-master-py3: {extends: '.test_instance'}
138138
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
139-
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
139+
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
140140
# default-ubuntu-1604-master-py3: {extends: '.test_instance'}
141141
# default-centos-8-master-py3: {extends: '.test_instance'}
142142
default-centos-7-master-py3: {extends: '.test_instance'}
143143
# default-fedora-33-master-py3: {extends: '.test_instance'}
144144
# default-fedora-32-master-py3: {extends: '.test_instance'}
145-
# default-fedora-31-master-py3: {extends: '.test_instance'}
146145
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
147146
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
148147
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
149148
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
150149
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
151-
# default-debian-10-3002-0-py3: {extends: '.test_instance'}
152-
# default-debian-9-3002-0-py3: {extends: '.test_instance'}
153-
# default-ubuntu-2004-3002-0-py3: {extends: '.test_instance'}
154-
# default-ubuntu-1804-3002-0-py3: {extends: '.test_instance'}
155-
# default-ubuntu-1604-3002-0-py3: {extends: '.test_instance'}
156-
# default-centos-8-3002-0-py3: {extends: '.test_instance'}
157-
# default-centos-7-3002-0-py3: {extends: '.test_instance'}
158-
# default-fedora-33-3002-0-py3: {extends: '.test_instance'}
159-
# default-fedora-32-3002-0-py3: {extends: '.test_instance'}
160-
# default-fedora-31-3002-0-py3: {extends: '.test_instance'}
161-
# default-opensuse-leap-152-3002-0-py3: {extends: '.test_instance'}
162-
# default-amazonlinux-2-3002-0-py3: {extends: '.test_instance'}
163-
# default-oraclelinux-8-3002-0-py3: {extends: '.test_instance'}
164-
default-oraclelinux-7-3002-0-py3: {extends: '.test_instance'}
165-
# default-arch-base-latest-3002-0-py3: {extends: '.test_instance'}
166-
# default-debian-10-3001-1-py3: {extends: '.test_instance'}
167-
# default-debian-9-3001-1-py3: {extends: '.test_instance'}
168-
# default-ubuntu-2004-3001-1-py3: {extends: '.test_instance'}
169-
# default-ubuntu-1804-3001-1-py3: {extends: '.test_instance'}
170-
# default-ubuntu-1604-3001-1-py3: {extends: '.test_instance'}
171-
# default-centos-8-3001-1-py3: {extends: '.test_instance'}
172-
# default-centos-7-3001-1-py3: {extends: '.test_instance'}
173-
# default-fedora-33-3001-1-py3: {extends: '.test_instance'}
174-
# default-fedora-32-3001-1-py3: {extends: '.test_instance'}
175-
# default-fedora-31-3001-1-py3: {extends: '.test_instance'}
176-
# default-opensuse-leap-152-3001-1-py3: {extends: '.test_instance'}
177-
# default-amazonlinux-2-3001-1-py3: {extends: '.test_instance'}
178-
# default-oraclelinux-8-3001-1-py3: {extends: '.test_instance'}
179-
# default-oraclelinux-7-3001-1-py3: {extends: '.test_instance'}
180-
# default-arch-base-latest-3001-1-py3: {extends: '.test_instance'}
181-
# default-gentoo-stage3-latest-3001-1-py3: {extends: '.test_instance'}
182-
# default-gentoo-stage3-systemd-3001-1-py3: {extends: '.test_instance'}
183-
# default-debian-10-3000-3-py3: {extends: '.test_instance'}
184-
# default-debian-9-3000-3-py3: {extends: '.test_instance'}
185-
# default-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
186-
# default-ubuntu-1604-3000-3-py3: {extends: '.test_instance'}
187-
# default-centos-8-3000-3-py3: {extends: '.test_instance'}
188-
# default-centos-7-3000-3-py3: {extends: '.test_instance'}
189-
# default-fedora-31-3000-3-py3: {extends: '.test_instance'}
190-
# default-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
191-
# default-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
192-
# default-oraclelinux-8-3000-3-py3: {extends: '.test_instance'}
193-
# default-oraclelinux-7-3000-3-py3: {extends: '.test_instance'}
194-
# default-gentoo-stage3-latest-3000-3-py3: {extends: '.test_instance'}
195-
# default-gentoo-stage3-systemd-3000-3-py3: {extends: '.test_instance'}
196-
# default-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
197-
# default-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
198-
# default-centos-6-3000-3-py2: {extends: '.test_instance'}
199-
# default-amazonlinux-1-3000-3-py2: {extends: '.test_instance'}
200-
# default-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
150+
# default-debian-10-3002-2-py3: {extends: '.test_instance'}
151+
# default-debian-9-3002-2-py3: {extends: '.test_instance'}
152+
# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
153+
# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
154+
# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
155+
# default-centos-8-3002-2-py3: {extends: '.test_instance'}
156+
# default-centos-7-3002-2-py3: {extends: '.test_instance'}
157+
# default-fedora-33-3002-2-py3: {extends: '.test_instance'}
158+
# default-fedora-32-3002-2-py3: {extends: '.test_instance'}
159+
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
160+
# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
161+
# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
162+
default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
163+
# default-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
164+
# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
165+
# default-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
166+
# default-debian-10-3001-4-py3: {extends: '.test_instance'}
167+
# default-debian-9-3001-4-py3: {extends: '.test_instance'}
168+
# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
169+
# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
170+
# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
171+
# default-centos-8-3001-4-py3: {extends: '.test_instance'}
172+
# default-centos-7-3001-4-py3: {extends: '.test_instance'}
173+
# default-fedora-33-3001-4-py3: {extends: '.test_instance'}
174+
# default-fedora-32-3001-4-py3: {extends: '.test_instance'}
175+
# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
176+
# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
177+
# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
178+
# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
179+
# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
180+
# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
181+
# default-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
182+
# default-debian-10-3000-6-py3: {extends: '.test_instance'}
183+
# default-debian-9-3000-6-py3: {extends: '.test_instance'}
184+
# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
185+
# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
186+
# default-centos-8-3000-6-py3: {extends: '.test_instance'}
187+
# default-centos-7-3000-6-py3: {extends: '.test_instance'}
188+
# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
189+
# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
190+
# default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
191+
# default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
192+
# default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
193+
# default-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
194+
# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
195+
# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
196+
# default-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
201197

202198
###############################################################################
203199
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 49 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -94,70 +94,66 @@ jobs:
9494
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
9595
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
9696
- env: INSTANCE=default-debian-10-master-py3
97-
# - env: INSTANCE=default-debian-9-master-py3
97+
- env: INSTANCE=default-debian-9-master-py3
9898
- env: INSTANCE=default-ubuntu-2004-master-py3
99-
# - env: INSTANCE=default-ubuntu-1804-master-py3
99+
- env: INSTANCE=default-ubuntu-1804-master-py3
100100
# - env: INSTANCE=default-ubuntu-1604-master-py3
101101
# - env: INSTANCE=default-centos-8-master-py3
102102
- env: INSTANCE=default-centos-7-master-py3
103103
# - env: INSTANCE=default-fedora-33-master-py3
104104
# - env: INSTANCE=default-fedora-32-master-py3
105-
# - env: INSTANCE=default-fedora-31-master-py3
106105
- env: INSTANCE=default-opensuse-leap-152-master-py3
107106
- env: INSTANCE=default-amazonlinux-2-master-py3
108107
# - env: INSTANCE=default-oraclelinux-8-master-py3
109108
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
110109
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
111-
# - env: INSTANCE=default-debian-10-3002-0-py3
112-
# - env: INSTANCE=default-debian-9-3002-0-py3
113-
# - env: INSTANCE=default-ubuntu-2004-3002-0-py3
114-
# - env: INSTANCE=default-ubuntu-1804-3002-0-py3
115-
# - env: INSTANCE=default-ubuntu-1604-3002-0-py3
116-
# - env: INSTANCE=default-centos-8-3002-0-py3
117-
# - env: INSTANCE=default-centos-7-3002-0-py3
118-
# - env: INSTANCE=default-fedora-33-3002-0-py3
119-
# - env: INSTANCE=default-fedora-32-3002-0-py3
120-
# - env: INSTANCE=default-fedora-31-3002-0-py3
121-
# - env: INSTANCE=default-opensuse-leap-152-3002-0-py3
122-
# - env: INSTANCE=default-amazonlinux-2-3002-0-py3
123-
# - env: INSTANCE=default-oraclelinux-8-3002-0-py3
124-
- env: INSTANCE=default-oraclelinux-7-3002-0-py3
125-
# - env: INSTANCE=default-arch-base-latest-3002-0-py3
126-
# - env: INSTANCE=default-debian-10-3001-1-py3
127-
# - env: INSTANCE=default-debian-9-3001-1-py3
128-
# - env: INSTANCE=default-ubuntu-2004-3001-1-py3
129-
# - env: INSTANCE=default-ubuntu-1804-3001-1-py3
130-
# - env: INSTANCE=default-ubuntu-1604-3001-1-py3
131-
# - env: INSTANCE=default-centos-8-3001-1-py3
132-
# - env: INSTANCE=default-centos-7-3001-1-py3
133-
# - env: INSTANCE=default-fedora-33-3001-1-py3
134-
# - env: INSTANCE=default-fedora-32-3001-1-py3
135-
# - env: INSTANCE=default-fedora-31-3001-1-py3
136-
# - env: INSTANCE=default-opensuse-leap-152-3001-1-py3
137-
# - env: INSTANCE=default-amazonlinux-2-3001-1-py3
138-
# - env: INSTANCE=default-oraclelinux-8-3001-1-py3
139-
# - env: INSTANCE=default-oraclelinux-7-3001-1-py3
140-
# - env: INSTANCE=default-arch-base-latest-3001-1-py3
141-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-1-py3
142-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-1-py3
143-
# - env: INSTANCE=default-debian-10-3000-3-py3
144-
# - env: INSTANCE=default-debian-9-3000-3-py3
145-
# - env: INSTANCE=default-ubuntu-1804-3000-3-py3
146-
# - env: INSTANCE=default-ubuntu-1604-3000-3-py3
147-
# - env: INSTANCE=default-centos-8-3000-3-py3
148-
# - env: INSTANCE=default-centos-7-3000-3-py3
149-
# - env: INSTANCE=default-fedora-31-3000-3-py3
150-
# - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
151-
# - env: INSTANCE=default-amazonlinux-2-3000-3-py3
152-
# - env: INSTANCE=default-oraclelinux-8-3000-3-py3
153-
# - env: INSTANCE=default-oraclelinux-7-3000-3-py3
154-
# - env: INSTANCE=default-gentoo-stage3-latest-3000-3-py3
155-
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-3-py3
156-
# - env: INSTANCE=default-ubuntu-1804-3000-3-py2
157-
# - env: INSTANCE=default-ubuntu-1604-3000-3-py2
158-
# - env: INSTANCE=default-centos-6-3000-3-py2
159-
# - env: INSTANCE=default-amazonlinux-1-3000-3-py2
160-
# - env: INSTANCE=default-arch-base-latest-3000-3-py2
110+
# - env: INSTANCE=default-debian-10-3002-2-py3
111+
# - env: INSTANCE=default-debian-9-3002-2-py3
112+
# - env: INSTANCE=default-ubuntu-2004-3002-2-py3
113+
# - env: INSTANCE=default-ubuntu-1804-3002-2-py3
114+
# - env: INSTANCE=default-ubuntu-1604-3002-2-py3
115+
# - env: INSTANCE=default-centos-8-3002-2-py3
116+
# - env: INSTANCE=default-centos-7-3002-2-py3
117+
# - env: INSTANCE=default-fedora-33-3002-2-py3
118+
# - env: INSTANCE=default-fedora-32-3002-2-py3
119+
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
120+
# - env: INSTANCE=default-amazonlinux-2-3002-2-py3
121+
# - env: INSTANCE=default-oraclelinux-8-3002-2-py3
122+
- env: INSTANCE=default-oraclelinux-7-3002-2-py3
123+
# - env: INSTANCE=default-arch-base-latest-3002-2-py3
124+
# - env: INSTANCE=default-gentoo-stage3-latest-3002-2-py3
125+
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-2-py3
126+
# - env: INSTANCE=default-debian-10-3001-4-py3
127+
# - env: INSTANCE=default-debian-9-3001-4-py3
128+
# - env: INSTANCE=default-ubuntu-2004-3001-4-py3
129+
# - env: INSTANCE=default-ubuntu-1804-3001-4-py3
130+
# - env: INSTANCE=default-ubuntu-1604-3001-4-py3
131+
# - env: INSTANCE=default-centos-8-3001-4-py3
132+
# - env: INSTANCE=default-centos-7-3001-4-py3
133+
# - env: INSTANCE=default-fedora-33-3001-4-py3
134+
# - env: INSTANCE=default-fedora-32-3001-4-py3
135+
# - env: INSTANCE=default-opensuse-leap-152-3001-4-py3
136+
# - env: INSTANCE=default-amazonlinux-2-3001-4-py3
137+
# - env: INSTANCE=default-oraclelinux-8-3001-4-py3
138+
# - env: INSTANCE=default-oraclelinux-7-3001-4-py3
139+
# - env: INSTANCE=default-arch-base-latest-3001-4-py3
140+
# - env: INSTANCE=default-gentoo-stage3-latest-3001-4-py3
141+
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-4-py3
142+
# - env: INSTANCE=default-debian-10-3000-6-py3
143+
# - env: INSTANCE=default-debian-9-3000-6-py3
144+
# - env: INSTANCE=default-ubuntu-1804-3000-6-py3
145+
# - env: INSTANCE=default-ubuntu-1604-3000-6-py3
146+
# - env: INSTANCE=default-centos-8-3000-6-py3
147+
# - env: INSTANCE=default-centos-7-3000-6-py3
148+
# - env: INSTANCE=default-opensuse-leap-152-3000-6-py3
149+
# - env: INSTANCE=default-amazonlinux-2-3000-6-py3
150+
# - env: INSTANCE=default-oraclelinux-8-3000-6-py3
151+
# - env: INSTANCE=default-oraclelinux-7-3000-6-py3
152+
# - env: INSTANCE=default-gentoo-stage3-latest-3000-6-py3
153+
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-6-py3
154+
# - env: INSTANCE=default-ubuntu-1804-3000-6-py2
155+
# - env: INSTANCE=default-ubuntu-1604-3000-6-py2
156+
# - env: INSTANCE=default-arch-base-latest-3000-6-py2
161157

162158
## Define the release stage that runs `semantic-release`
163159
- stage: 'release'

0 commit comments

Comments
 (0)