Skip to content

Commit d16e91c

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

File tree

8 files changed

+191
-92
lines changed

8 files changed

+191
-92
lines changed

‎.gitlab-ci.yml

+31-20
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ rubocop:
132132
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
133133
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
134134
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
135+
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
136+
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
135137
default-debian-10-master-py3: {extends: '.test_instance'}
136138
default-debian-9-master-py3: {extends: '.test_instance'}
137139
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
@@ -140,6 +142,7 @@ default-centos-8-master-py3: {extends: '.test_instance'}
140142
default-centos-7-master-py3: {extends: '.test_instance'}
141143
default-fedora-34-master-py3: {extends: '.test_instance'}
142144
default-fedora-33-master-py3: {extends: '.test_instance'}
145+
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
143146
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
144147
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
145148
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -148,20 +151,25 @@ default-oraclelinux-7-master-py3: {extends: '.test_instance'}
148151
default-arch-base-latest-master-py3: {extends: '.test_instance'}
149152
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
150153
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
151-
# default-debian-10-3003-0-py3: {extends: '.test_instance'}
152-
# default-debian-9-3003-0-py3: {extends: '.test_instance'}
153-
# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
154-
# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
155-
# default-centos-8-3003-0-py3: {extends: '.test_instance'}
156-
# default-centos-7-3003-0-py3: {extends: '.test_instance'}
157-
# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
158-
# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
159-
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
160-
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
161-
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
162-
# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
163-
# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
164-
# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
154+
default-almalinux-8-master-py3: {extends: '.test_instance'}
155+
default-rockylinux-8-master-py3: {extends: '.test_instance'}
156+
# default-debian-10-3003-1-py3: {extends: '.test_instance'}
157+
# default-debian-9-3003-1-py3: {extends: '.test_instance'}
158+
# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
159+
# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
160+
# default-centos-8-3003-1-py3: {extends: '.test_instance'}
161+
# default-centos-7-3003-1-py3: {extends: '.test_instance'}
162+
# default-fedora-34-3003-1-py3: {extends: '.test_instance'}
163+
# default-fedora-33-3003-1-py3: {extends: '.test_instance'}
164+
# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
165+
# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
166+
# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
167+
# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
168+
# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
169+
# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
170+
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
171+
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
172+
# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
165173
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
166174
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
167175
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
@@ -174,8 +182,9 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'}
174182
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
175183
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
176184
# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
177-
# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
178-
# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
185+
# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
186+
# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
187+
# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
179188
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
180189
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
181190
# default-debian-10-3001-7-py3: {extends: '.test_instance'}
@@ -186,27 +195,29 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'}
186195
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
187196
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
188197
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
198+
# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
189199
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
190200
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
191201
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
192202
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
193203
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
194204
# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
195-
# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
196-
# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
205+
# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
206+
# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
197207
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
198208
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
199209
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
200210
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
201211
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
212+
# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
202213
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
203214
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
204215
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
205216
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
217+
# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
218+
# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
206219
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
207220
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
208-
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
209-
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
210221

211222
###############################################################################
212223
# `release` stage: `semantic-release`

‎.pre-commit-config.yaml

+11
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

+31-20
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ jobs:
9292
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
9393
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
9494
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
95+
# - env: INSTANCE=default-almalinux-8-tiamat-py3
96+
# - env: INSTANCE=default-rockylinux-8-tiamat-py3
9597
- env: INSTANCE=default-debian-10-master-py3
9698
- env: INSTANCE=default-debian-9-master-py3
9799
- env: INSTANCE=default-ubuntu-2004-master-py3
@@ -100,6 +102,7 @@ jobs:
100102
- env: INSTANCE=default-centos-7-master-py3
101103
- env: INSTANCE=default-fedora-34-master-py3
102104
- env: INSTANCE=default-fedora-33-master-py3
105+
- env: INSTANCE=default-opensuse-leap-153-master-py3
103106
- env: INSTANCE=default-opensuse-leap-152-master-py3
104107
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
105108
- env: INSTANCE=default-amazonlinux-2-master-py3
@@ -108,20 +111,25 @@ jobs:
108111
- env: INSTANCE=default-arch-base-latest-master-py3
109112
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
110113
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
111-
# - env: INSTANCE=default-debian-10-3003-0-py3
112-
# - env: INSTANCE=default-debian-9-3003-0-py3
113-
# - env: INSTANCE=default-ubuntu-2004-3003-0-py3
114-
# - env: INSTANCE=default-ubuntu-1804-3003-0-py3
115-
# - env: INSTANCE=default-centos-8-3003-0-py3
116-
# - env: INSTANCE=default-centos-7-3003-0-py3
117-
# - env: INSTANCE=default-fedora-34-3003-0-py3
118-
# - env: INSTANCE=default-fedora-33-3003-0-py3
119-
# - env: INSTANCE=default-amazonlinux-2-3003-0-py3
120-
# - env: INSTANCE=default-oraclelinux-8-3003-0-py3
121-
# - env: INSTANCE=default-oraclelinux-7-3003-0-py3
122-
# - env: INSTANCE=default-arch-base-latest-3003-0-py3
123-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3
124-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3
114+
- env: INSTANCE=default-almalinux-8-master-py3
115+
- env: INSTANCE=default-rockylinux-8-master-py3
116+
# - env: INSTANCE=default-debian-10-3003-1-py3
117+
# - env: INSTANCE=default-debian-9-3003-1-py3
118+
# - env: INSTANCE=default-ubuntu-2004-3003-1-py3
119+
# - env: INSTANCE=default-ubuntu-1804-3003-1-py3
120+
# - env: INSTANCE=default-centos-8-3003-1-py3
121+
# - env: INSTANCE=default-centos-7-3003-1-py3
122+
# - env: INSTANCE=default-fedora-34-3003-1-py3
123+
# - env: INSTANCE=default-fedora-33-3003-1-py3
124+
# - env: INSTANCE=default-opensuse-leap-153-3003-1-py3
125+
# - env: INSTANCE=default-opensuse-leap-152-3003-1-py3
126+
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3
127+
# - env: INSTANCE=default-amazonlinux-2-3003-1-py3
128+
# - env: INSTANCE=default-oraclelinux-8-3003-1-py3
129+
# - env: INSTANCE=default-oraclelinux-7-3003-1-py3
130+
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
131+
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
132+
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
125133
# - env: INSTANCE=default-debian-10-3002-6-py3
126134
# - env: INSTANCE=default-debian-9-3002-6-py3
127135
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
@@ -134,8 +142,9 @@ jobs:
134142
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
135143
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
136144
# - env: INSTANCE=default-arch-base-latest-3002-6-py3
137-
# - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3
138-
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3
145+
# - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3
146+
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3
147+
# - env: INSTANCE=default-opensuse-leap-153-3002-2-py3
139148
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
140149
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
141150
# - env: INSTANCE=default-debian-10-3001-7-py3
@@ -146,27 +155,29 @@ jobs:
146155
# - env: INSTANCE=default-centos-7-3001-7-py3
147156
# - env: INSTANCE=default-fedora-34-3001-7-py3
148157
# - env: INSTANCE=default-fedora-33-3001-7-py3
158+
# - env: INSTANCE=default-opensuse-leap-153-3001-7-py3
149159
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
150160
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
151161
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
152162
# - env: INSTANCE=default-oraclelinux-8-3001-7-py3
153163
# - env: INSTANCE=default-oraclelinux-7-3001-7-py3
154164
# - env: INSTANCE=default-arch-base-latest-3001-7-py3
155-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3
156-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3
165+
# - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3
166+
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3
157167
# - env: INSTANCE=default-debian-10-3000-9-py3
158168
# - env: INSTANCE=default-debian-9-3000-9-py3
159169
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
160170
# - env: INSTANCE=default-centos-8-3000-9-py3
161171
# - env: INSTANCE=default-centos-7-3000-9-py3
172+
# - env: INSTANCE=default-opensuse-leap-153-3000-9-py3
162173
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
163174
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
164175
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
165176
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
177+
# - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3
178+
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3
166179
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
167180
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
168-
# - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
169-
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3
170181

171182
## Define the release stage that runs `semantic-release`
172183
- stage: 'release'

‎Gemfile.lock

+1-1
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)