Skip to content

Commit c16e22a

Browse files
committed
ci: update pre-commit configuration inc. for pre-commit.ci [skip ci]
* Automated using myii/ssf-formula#450
1 parent ded38ac commit c16e22a

File tree

4 files changed

+13
-59
lines changed

4 files changed

+13
-59
lines changed

.gitlab-ci.yml

-10
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
157157
without-ipv6-centos-7-master-py3: {extends: '.test_instance'}
158158
without-ipv6-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
159159
without-ipv6-fedora-35-master-py3: {extends: '.test_instance'}
160-
without-ipv6-fedora-34-master-py3: {extends: '.test_instance'}
161160
without-ipv6-opensuse-leap-153-master-py3: {extends: '.test_instance'}
162161
# without-ipv6-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
163162
without-ipv6-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -181,7 +180,6 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
181180
# without-ipv6-centos-7-3004-1-py3: {extends: '.test_instance'}
182181
# without-ipv6-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
183182
# without-ipv6-fedora-35-3004-1-py3: {extends: '.test_instance'}
184-
# without-ipv6-fedora-34-3004-1-py3: {extends: '.test_instance'}
185183
# without-ipv6-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
186184
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
187185
# without-ipv6-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
@@ -202,14 +200,6 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
202200
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
203201
# without-ipv6-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
204202
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
205-
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
206-
# without-ipv6-debian-9-3002-8-py3: {extends: '.test_instance'}
207-
# without-ipv6-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
208-
# without-ipv6-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
209-
# without-ipv6-centos-7-3002-8-py3: {extends: '.test_instance'}
210-
# without-ipv6-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
211-
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
212-
# without-ipv6-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
213203
# yamllint enable rule:line-length
214204

215205
###############################################################################

.pre-commit-config.yaml

+13-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
---
44
# See https://pre-commit.com for more information
55
# See https://pre-commit.com/hooks.html for more hooks
6+
ci:
7+
autofix_commit_msg: |
8+
ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
9+
10+
For more information, see https://pre-commit.ci
11+
autofix_prs: true
12+
autoupdate_branch: ''
13+
autoupdate_commit_msg: |
14+
ci(pre-commit.ci): perform `pre-commit` autoupdate
15+
autoupdate_schedule: quarterly
16+
skip: []
17+
submodules: false
618
default_stages: [commit]
719
repos:
820
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@@ -18,7 +30,7 @@ repos:
1830
additional_dependencies: ['@commitlint/[email protected]']
1931
always_run: true
2032
- repo: https://github.com/rubocop-hq/rubocop
21-
rev: v1.25.1
33+
rev: v1.30.1
2234
hooks:
2335
- id: rubocop
2436
name: Check Ruby files with rubocop

.travis.yml

-10
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ jobs:
109109
- env: INSTANCE=without-ipv6-centos-7-master-py3
110110
- env: INSTANCE=without-ipv6-fedora-36-master-py3
111111
- env: INSTANCE=without-ipv6-fedora-35-master-py3
112-
- env: INSTANCE=without-ipv6-fedora-34-master-py3
113112
- env: INSTANCE=without-ipv6-opensuse-leap-153-master-py3
114113
# - env: INSTANCE=without-ipv6-opensuse-tmbl-latest-master-py3
115114
- env: INSTANCE=without-ipv6-amazonlinux-2-master-py3
@@ -133,7 +132,6 @@ jobs:
133132
# - env: INSTANCE=without-ipv6-centos-7-3004-1-py3
134133
# - env: INSTANCE=without-ipv6-fedora-36-3004-1-py3
135134
# - env: INSTANCE=without-ipv6-fedora-35-3004-1-py3
136-
# - env: INSTANCE=without-ipv6-fedora-34-3004-1-py3
137135
# - env: INSTANCE=without-ipv6-amazonlinux-2-3004-1-py3
138136
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
139137
# - env: INSTANCE=without-ipv6-oraclelinux-7-3004-1-py3
@@ -154,14 +152,6 @@ jobs:
154152
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
155153
# - env: INSTANCE=without-ipv6-oraclelinux-7-3003-4-py3
156154
# - env: INSTANCE=default-almalinux-8-3003-4-py3
157-
# - env: INSTANCE=default-debian-10-3002-8-py3
158-
# - env: INSTANCE=without-ipv6-debian-9-3002-8-py3
159-
# - env: INSTANCE=without-ipv6-ubuntu-2004-3002-8-py3
160-
# - env: INSTANCE=without-ipv6-ubuntu-1804-3002-8-py3
161-
# - env: INSTANCE=without-ipv6-centos-7-3002-8-py3
162-
# - env: INSTANCE=without-ipv6-amazonlinux-2-3002-8-py3
163-
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
164-
# - env: INSTANCE=without-ipv6-oraclelinux-7-3002-8-py3
165155

166156
## Define the release stage that runs `semantic-release`
167157
- stage: 'release'

kitchen.yml

-38
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ platforms:
103103
- name: fedora-35-master-py3
104104
driver:
105105
image: saltimages/salt-master-py3:fedora-35
106-
- name: fedora-34-master-py3
107-
driver:
108-
image: saltimages/salt-master-py3:fedora-34
109106
- name: opensuse-leap-153-master-py3
110107
driver:
111108
image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -183,9 +180,6 @@ platforms:
183180
- name: fedora-35-3004-1-py3
184181
driver:
185182
image: saltimages/salt-3004.1-py3:fedora-35
186-
- name: fedora-34-3004-1-py3
187-
driver:
188-
image: saltimages/salt-3004.1-py3:fedora-34
189183
- name: amazonlinux-2-3004-1-py3
190184
driver:
191185
image: saltimages/salt-3004.1-py3:amazonlinux-2
@@ -264,36 +258,6 @@ platforms:
264258
driver:
265259
image: saltimages/salt-3003.4-py3:almalinux-8
266260

267-
## SALT `3002.8`
268-
- name: debian-10-3002-8-py3
269-
driver:
270-
image: saltimages/salt-3002.8-py3:debian-10
271-
run_command: /lib/systemd/systemd
272-
- name: debian-9-3002-8-py3
273-
driver:
274-
image: saltimages/salt-3002.8-py3:debian-9
275-
run_command: /lib/systemd/systemd
276-
- name: ubuntu-2004-3002-8-py3
277-
driver:
278-
image: saltimages/salt-3002.8-py3:ubuntu-20.04
279-
run_command: /lib/systemd/systemd
280-
- name: ubuntu-1804-3002-8-py3
281-
driver:
282-
image: saltimages/salt-3002.8-py3:ubuntu-18.04
283-
run_command: /lib/systemd/systemd
284-
- name: centos-7-3002-8-py3
285-
driver:
286-
image: saltimages/salt-3002.8-py3:centos-7
287-
- name: amazonlinux-2-3002-8-py3
288-
driver:
289-
image: saltimages/salt-3002.8-py3:amazonlinux-2
290-
- name: oraclelinux-8-3002-8-py3
291-
driver:
292-
image: saltimages/salt-3002.8-py3:oraclelinux-8
293-
- name: oraclelinux-7-3002-8-py3
294-
driver:
295-
image: saltimages/salt-3002.8-py3:oraclelinux-7
296-
297261
verifier:
298262
# https://www.inspec.io/
299263
name: inspec
@@ -327,8 +291,6 @@ suites:
327291
- centos-stream8-3003-4-py3
328292
- oraclelinux-8-3003-4-py3
329293
- almalinux-8-3003-4-py3
330-
- debian-10-3002-8-py3
331-
- oraclelinux-8-3002-8-py3
332294
provisioner:
333295
state_top:
334296
base:

0 commit comments

Comments
 (0)