Skip to content

Commit f937dca

Browse files
myiimyii
committed
ci(3003.1): update inc. AlmaLinux, Rocky & rst-lint [skip ci]
* Automated using myii/ssf-formula#335
1 parent 261081a commit f937dca

File tree

10 files changed

+212
-101
lines changed

10 files changed

+212
-101
lines changed

‎.gitlab-ci.yml

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ rubocop:
132132
# git-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
133133
# git-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
134134
# git-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
135+
# git-almalinux-8-tiamat-py3: {extends: '.test_instance'}
136+
# git-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
135137
# git-debian-10-master-py3: {extends: '.test_instance'}
136138
deb-debian-10-master-py3: {extends: '.test_instance'}
137139
# git-debian-9-master-py3: {extends: '.test_instance'}
@@ -146,6 +148,7 @@ rpm-centos-7-master-py3: {extends: '.test_instance'}
146148
rpm-fedora-34-master-py3: {extends: '.test_instance'}
147149
# git-fedora-33-master-py3: {extends: '.test_instance'}
148150
rpm-fedora-33-master-py3: {extends: '.test_instance'}
151+
git-opensuse-leap-153-master-py3: {extends: '.test_instance'}
149152
git-opensuse-leap-152-master-py3: {extends: '.test_instance'}
150153
git-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
151154
# git-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -157,20 +160,27 @@ rpm-oraclelinux-8-master-py3: {extends: '.test_instance'}
157160
git-arch-base-latest-master-py3: {extends: '.test_instance'}
158161
git-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
159162
git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
160-
# git-debian-10-3003-0-py3: {extends: '.test_instance'}
161-
# git-debian-9-3003-0-py3: {extends: '.test_instance'}
162-
# git-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
163-
# git-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
164-
# git-centos-8-3003-0-py3: {extends: '.test_instance'}
165-
# git-centos-7-3003-0-py3: {extends: '.test_instance'}
166-
# git-fedora-34-3003-0-py3: {extends: '.test_instance'}
167-
# git-fedora-33-3003-0-py3: {extends: '.test_instance'}
168-
# git-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
169-
# git-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
170-
# git-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
171-
# git-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
172-
# git-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
173-
# git-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
163+
# git-almalinux-8-master-py3: {extends: '.test_instance'}
164+
rpm-almalinux-8-master-py3: {extends: '.test_instance'}
165+
# git-rockylinux-8-master-py3: {extends: '.test_instance'}
166+
rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
167+
# git-debian-10-3003-1-py3: {extends: '.test_instance'}
168+
# git-debian-9-3003-1-py3: {extends: '.test_instance'}
169+
# git-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
170+
# git-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
171+
# git-centos-8-3003-1-py3: {extends: '.test_instance'}
172+
# git-centos-7-3003-1-py3: {extends: '.test_instance'}
173+
# git-fedora-34-3003-1-py3: {extends: '.test_instance'}
174+
# git-fedora-33-3003-1-py3: {extends: '.test_instance'}
175+
# git-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
176+
# git-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
177+
# git-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
178+
# git-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
179+
# git-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
180+
# git-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
181+
# git-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
182+
# git-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
183+
# git-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
174184
# git-debian-10-3002-6-py3: {extends: '.test_instance'}
175185
# git-debian-9-3002-6-py3: {extends: '.test_instance'}
176186
# git-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
@@ -183,8 +193,9 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
183193
# git-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
184194
# git-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
185195
# git-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
186-
# git-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
187-
# git-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
196+
# git-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
197+
# git-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
198+
# git-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
188199
# git-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
189200
# git-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
190201
# git-debian-10-3001-7-py3: {extends: '.test_instance'}
@@ -195,27 +206,29 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
195206
# git-centos-7-3001-7-py3: {extends: '.test_instance'}
196207
# git-fedora-34-3001-7-py3: {extends: '.test_instance'}
197208
# git-fedora-33-3001-7-py3: {extends: '.test_instance'}
209+
# git-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
198210
# git-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
199211
# git-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
200212
# git-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
201213
# git-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
202214
# git-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
203215
# git-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
204-
# git-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
205-
# git-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
216+
# git-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
217+
# git-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
206218
# git-debian-10-3000-9-py3: {extends: '.test_instance'}
207219
# git-debian-9-3000-9-py3: {extends: '.test_instance'}
208220
# git-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
209221
# git-centos-8-3000-9-py3: {extends: '.test_instance'}
210222
# git-centos-7-3000-9-py3: {extends: '.test_instance'}
223+
# git-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
211224
# git-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
212225
# git-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
213226
# git-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
214227
# git-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
228+
# git-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
229+
# git-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
215230
# git-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
216231
# git-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
217-
# git-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
218-
# git-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
219232

220233
###############################################################################
221234
# `release` stage: `semantic-release`

‎.pre-commit-config.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,14 @@ repos:
5252
- id: rstcheck
5353
name: Check reST files using rstcheck
5454
exclude: 'docs/CHANGELOG.rst'
55+
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
56+
rev: v1.3.2
57+
hooks:
58+
- id: rst-lint
59+
name: Check reST files using rst-lint
60+
exclude: |
61+
(?x)^(
62+
docs/CHANGELOG.rst|
63+
docs/TOFS_pattern.rst|
64+
)$
65+
additional_dependencies: [pygments==2.9.0]

‎.travis.yml

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ jobs:
9292
# - env: INSTANCE=git-amazonlinux-2-tiamat-py3
9393
# - env: INSTANCE=git-oraclelinux-8-tiamat-py3
9494
# - env: INSTANCE=git-oraclelinux-7-tiamat-py3
95+
# - env: INSTANCE=git-almalinux-8-tiamat-py3
96+
# - env: INSTANCE=git-rockylinux-8-tiamat-py3
9597
# - env: INSTANCE=git-debian-10-master-py3
9698
- env: INSTANCE=deb-debian-10-master-py3
9799
# - env: INSTANCE=git-debian-9-master-py3
@@ -106,6 +108,7 @@ jobs:
106108
- env: INSTANCE=rpm-fedora-34-master-py3
107109
# - env: INSTANCE=git-fedora-33-master-py3
108110
- env: INSTANCE=rpm-fedora-33-master-py3
111+
- env: INSTANCE=git-opensuse-leap-153-master-py3
109112
- env: INSTANCE=git-opensuse-leap-152-master-py3
110113
- env: INSTANCE=git-opensuse-tmbl-latest-master-py3
111114
# - env: INSTANCE=git-amazonlinux-2-master-py3
@@ -117,20 +120,27 @@ jobs:
117120
- env: INSTANCE=git-arch-base-latest-master-py3
118121
- env: INSTANCE=git-gentoo-stage3-latest-master-py3
119122
- env: INSTANCE=git-gentoo-stage3-systemd-master-py3
120-
# - env: INSTANCE=git-debian-10-3003-0-py3
121-
# - env: INSTANCE=git-debian-9-3003-0-py3
122-
# - env: INSTANCE=git-ubuntu-2004-3003-0-py3
123-
# - env: INSTANCE=git-ubuntu-1804-3003-0-py3
124-
# - env: INSTANCE=git-centos-8-3003-0-py3
125-
# - env: INSTANCE=git-centos-7-3003-0-py3
126-
# - env: INSTANCE=git-fedora-34-3003-0-py3
127-
# - env: INSTANCE=git-fedora-33-3003-0-py3
128-
# - env: INSTANCE=git-amazonlinux-2-3003-0-py3
129-
# - env: INSTANCE=git-oraclelinux-8-3003-0-py3
130-
# - env: INSTANCE=git-oraclelinux-7-3003-0-py3
131-
# - env: INSTANCE=git-arch-base-latest-3003-0-py3
132-
# - env: INSTANCE=git-gentoo-stage3-latest-3003-0-py3
133-
# - env: INSTANCE=git-gentoo-stage3-systemd-3003-0-py3
123+
# - env: INSTANCE=git-almalinux-8-master-py3
124+
- env: INSTANCE=rpm-almalinux-8-master-py3
125+
# - env: INSTANCE=git-rockylinux-8-master-py3
126+
- env: INSTANCE=rpm-rockylinux-8-master-py3
127+
# - env: INSTANCE=git-debian-10-3003-1-py3
128+
# - env: INSTANCE=git-debian-9-3003-1-py3
129+
# - env: INSTANCE=git-ubuntu-2004-3003-1-py3
130+
# - env: INSTANCE=git-ubuntu-1804-3003-1-py3
131+
# - env: INSTANCE=git-centos-8-3003-1-py3
132+
# - env: INSTANCE=git-centos-7-3003-1-py3
133+
# - env: INSTANCE=git-fedora-34-3003-1-py3
134+
# - env: INSTANCE=git-fedora-33-3003-1-py3
135+
# - env: INSTANCE=git-opensuse-leap-153-3003-1-py3
136+
# - env: INSTANCE=git-opensuse-leap-152-3003-1-py3
137+
# - env: INSTANCE=git-opensuse-tmbl-latest-3003-1-py3
138+
# - env: INSTANCE=git-amazonlinux-2-3003-1-py3
139+
# - env: INSTANCE=git-oraclelinux-8-3003-1-py3
140+
# - env: INSTANCE=git-oraclelinux-7-3003-1-py3
141+
# - env: INSTANCE=git-arch-base-latest-3003-1-py3
142+
# - env: INSTANCE=git-gentoo-stage3-latest-3003-1-py3
143+
# - env: INSTANCE=git-gentoo-stage3-systemd-3003-1-py3
134144
# - env: INSTANCE=git-debian-10-3002-6-py3
135145
# - env: INSTANCE=git-debian-9-3002-6-py3
136146
# - env: INSTANCE=git-ubuntu-2004-3002-6-py3
@@ -143,8 +153,9 @@ jobs:
143153
# - env: INSTANCE=git-oraclelinux-8-3002-6-py3
144154
# - env: INSTANCE=git-oraclelinux-7-3002-6-py3
145155
# - env: INSTANCE=git-arch-base-latest-3002-6-py3
146-
# - env: INSTANCE=git-gentoo-stage3-latest-3002-5-py3
147-
# - env: INSTANCE=git-gentoo-stage3-systemd-3002-5-py3
156+
# - env: INSTANCE=git-gentoo-stage3-latest-3002-6-py3
157+
# - env: INSTANCE=git-gentoo-stage3-systemd-3002-6-py3
158+
# - env: INSTANCE=git-opensuse-leap-153-3002-2-py3
148159
# - env: INSTANCE=git-opensuse-leap-152-3002-2-py3
149160
# - env: INSTANCE=git-opensuse-tmbl-latest-3002-2-py3
150161
# - env: INSTANCE=git-debian-10-3001-7-py3
@@ -155,27 +166,29 @@ jobs:
155166
# - env: INSTANCE=git-centos-7-3001-7-py3
156167
# - env: INSTANCE=git-fedora-34-3001-7-py3
157168
# - env: INSTANCE=git-fedora-33-3001-7-py3
169+
# - env: INSTANCE=git-opensuse-leap-153-3001-7-py3
158170
# - env: INSTANCE=git-opensuse-leap-152-3001-7-py3
159171
# - env: INSTANCE=git-opensuse-tmbl-latest-3001-7-py3
160172
# - env: INSTANCE=git-amazonlinux-2-3001-7-py3
161173
# - env: INSTANCE=git-oraclelinux-8-3001-7-py3
162174
# - env: INSTANCE=git-oraclelinux-7-3001-7-py3
163175
# - env: INSTANCE=git-arch-base-latest-3001-7-py3
164-
# - env: INSTANCE=git-gentoo-stage3-latest-3001-6-py3
165-
# - env: INSTANCE=git-gentoo-stage3-systemd-3001-6-py3
176+
# - env: INSTANCE=git-gentoo-stage3-latest-3001-7-py3
177+
# - env: INSTANCE=git-gentoo-stage3-systemd-3001-7-py3
166178
# - env: INSTANCE=git-debian-10-3000-9-py3
167179
# - env: INSTANCE=git-debian-9-3000-9-py3
168180
# - env: INSTANCE=git-ubuntu-1804-3000-9-py3
169181
# - env: INSTANCE=git-centos-8-3000-9-py3
170182
# - env: INSTANCE=git-centos-7-3000-9-py3
183+
# - env: INSTANCE=git-opensuse-leap-153-3000-9-py3
171184
# - env: INSTANCE=git-opensuse-leap-152-3000-9-py3
172185
# - env: INSTANCE=git-amazonlinux-2-3000-9-py3
173186
# - env: INSTANCE=git-oraclelinux-8-3000-9-py3
174187
# - env: INSTANCE=git-oraclelinux-7-3000-9-py3
188+
# - env: INSTANCE=git-gentoo-stage3-latest-3000-9-py3
189+
# - env: INSTANCE=git-gentoo-stage3-systemd-3000-9-py3
175190
# - env: INSTANCE=git-ubuntu-1804-3000-9-py2
176191
# - env: INSTANCE=git-arch-base-latest-3000-9-py2
177-
# - env: INSTANCE=git-gentoo-stage3-latest-3000-8-py3
178-
# - env: INSTANCE=git-gentoo-stage3-systemd-3000-8-py3
179192

180193
## Define the release stage that runs `semantic-release`
181194
- stage: 'release'

‎Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
3-
revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37
3+
revision: 1f543f654da5c1774cb8737f6f07a01745520bb5
44
branch: ssf
55
specs:
66
kitchen-docker (2.10.0)

0 commit comments

Comments
 (0)