Skip to content

Commit 9dbdcb6

Browse files
sylvainfaivresylvainfaivre
committed
ci: use latest test images
1 parent dae8c01 commit 9dbdcb6

6 files changed

Lines changed: 190 additions & 255 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 18 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
stage_release: &stage_release 'release'
1414
stage_test: &stage_test 'test'
1515
# `image`
16-
image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
17-
image_dindruby: &image_dindruby 'dafyddj/ci-dind-python-ruby:2.0.2'
18-
image_dindrubybionic: &image_dindrubybionic 'dafyddj/ci-dind-python-ruby:2.0.2'
19-
image_precommit: &image_precommit 'dafyddj/ci-pre-commit:2.1.0'
16+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.76'
17+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.45'
18+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.45'
19+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.10'
2020
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
2121
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
2222
# `services`
@@ -130,69 +130,21 @@ rubocop:
130130
# Make sure the instances listed below match up with
131131
# the `platforms` defined in `kitchen.yml`
132132
# yamllint disable rule:line-length
133-
# default-debian-11-tiamat-py3: {extends: '.test_instance'}
134-
# default-debian-10-tiamat-py3: {extends: '.test_instance'}
135-
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
136-
# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
137-
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
138-
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
139-
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
140-
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
141-
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
142-
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
143-
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
144-
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
145-
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
133+
default-debian-12-master-py3: {extends: '.test_instance'}
146134
default-debian-11-master-py3: {extends: '.test_instance'}
147-
# default-debian-10-master-py3: {extends: '.test_instance'}
148-
# default-debian-9-master-py3: {extends: '.test_instance'}
149-
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
150-
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
151-
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
152-
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
153-
# default-centos-7-master-py3: {extends: '.test_instance'}
154-
default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
155-
default-fedora-35-master-py3: {extends: '.test_instance'}
156-
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
157-
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
158-
default-amazonlinux-2-master-py3: {extends: '.test_instance_failure_permitted'}
159-
default-oraclelinux-8-master-py3: {extends: '.test_instance'}
160-
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
161-
default-arch-base-latest-master-py3: {extends: '.test_instance'}
162-
default-gentoo-stage3-latest-master-py3: {extends: '.test_instance_failure_permitted'}
163-
default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance_failure_permitted'}
164-
default-almalinux-8-master-py3: {extends: '.test_instance'}
165-
default-rockylinux-8-master-py3: {extends: '.test_instance'}
166-
# default-debian-11-3004-1-py3: {extends: '.test_instance'}
167-
# default-debian-10-3004-1-py3: {extends: '.test_instance'}
168-
# default-debian-9-3004-1-py3: {extends: '.test_instance'}
169-
# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
170-
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
171-
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
172-
# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
173-
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
174-
# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
175-
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
176-
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
177-
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
178-
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
179-
# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
180-
# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
181-
# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
182-
# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
183-
# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
184-
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
185-
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
186-
# default-debian-10-3003-4-py3: {extends: '.test_instance'}
187-
# default-debian-9-3003-4-py3: {extends: '.test_instance'}
188-
# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
189-
# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
190-
# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
191-
# default-centos-7-3003-4-py3: {extends: '.test_instance'}
192-
# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
193-
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
194-
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
195-
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
135+
default-ubuntu-2404-master-py3: {extends: '.test_instance'}
136+
default-ubuntu-2204-master-py3: {extends: '.test_instance'}
137+
default-fedora-40-master-py3: {extends: '.test_instance'}
138+
default-debian-12-3007-1-py3: {extends: '.test_instance'}
139+
default-debian-11-3007-1-py3: {extends: '.test_instance'}
140+
default-ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
141+
default-ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
142+
default-fedora-40-3007-1-py3: {extends: '.test_instance'}
143+
default-debian-12-3006-10-py3: {extends: '.test_instance'}
144+
default-debian-11-3006-10-py3: {extends: '.test_instance'}
145+
default-ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
146+
default-ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
147+
default-fedora-40-3006-10-py3: {extends: '.test_instance'}
196148
# yamllint enable rule:line-length
197149

198150
###############################################################################

‎.pre-commit-config.yaml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ repos:
3131
- id: rubocop
3232
name: Check Ruby files with rubocop
3333
args: [--debug]
34-
always_run: true
35-
pass_filenames: false
3634
- repo: https://github.com/shellcheck-py/shellcheck-py
3735
rev: v0.9.0.6
3836
hooks:
@@ -45,21 +43,43 @@ repos:
4543
hooks:
4644
- id: yamllint
4745
name: Check YAML syntax with yamllint
48-
args: [--strict, '.']
49-
always_run: true
50-
pass_filenames: false
46+
args: [--strict]
47+
types: [file]
48+
# Files to include
49+
# 1. Obvious YAML files
50+
# 2. `pillar.example` and similar files
51+
# 3. SLS files under directory `test/` which are pillar files
52+
# Files to exclude
53+
# 1. SLS files under directory `test/` which are state files
54+
# 2. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
55+
# 3. YAML files heavily reliant on Jinja
56+
files: |
57+
(?x)^(
58+
.*\.yaml|
59+
.*\.yml|
60+
\.salt-lint|
61+
\.yamllint|
62+
.*\.example|
63+
test/.*\.sls
64+
)$
65+
exclude: |
66+
(?x)^(
67+
kitchen.vagrant.yml|
68+
test/.*/states/.*\.sls
69+
)$
5170
- repo: https://github.com/warpnet/salt-lint
5271
rev: v0.9.2
5372
hooks:
5473
- id: salt-lint
5574
name: Check Salt files using salt-lint
5675
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
5776
- repo: https://github.com/myint/rstcheck
58-
rev: v6.2.4
77+
rev: v6.2.0
5978
hooks:
6079
- id: rstcheck
6180
name: Check reST files using rstcheck
6281
exclude: 'docs/CHANGELOG.rst'
82+
additional_dependencies: [sphinx==7.2.6]
6383
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
6484
rev: v1.3.2
6585
hooks:
@@ -69,5 +89,7 @@ repos:
6989
(?x)^(
7090
docs/CHANGELOG.rst|
7191
docs/TOFS_pattern.rst|
92+
docs/CONTRIBUTING_DOCS.rst|
93+
docs/index.rst|
7294
)$
7395
additional_dependencies: [pygments==2.16.1]

‎.rstcheck.cfg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
[rstcheck]
22
report=info
33
ignore_language=rst
4-
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
4+
# salt['config.get']('roles') is misidentified as a Markdown link.
5+
# Ignore for now, but perhaps try to submit a fix upstream in rstcheck
6+
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$|\(rst\) Link is formatted in Markdown style\.)

‎.rubocop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Layout/LineLength:
77
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
88
Max: 88
99
Metrics/BlockLength:
10-
IgnoredMethods:
10+
AllowedMethods:
1111
- control
1212
- describe
1313
# Increase from default of `25`

‎.yamllint‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,6 @@
44
# Extend the `default` configuration provided by `yamllint`
55
extends: 'default'
66

7-
# Files to ignore completely
8-
# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
9-
# 2. All YAML files under directory `.cache/`, introduced during the CI run
10-
# 3. All YAML files under directory `.git/`
11-
# 4. All YAML files under directory `node_modules/`, introduced during the CI run
12-
# 5. Any SLS files under directory `test/`, which are actually state files
13-
# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
14-
# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
15-
ignore: |
16-
.bundle/
17-
.cache/
18-
.git/
19-
node_modules/
20-
test/**/states/**/*.sls
21-
.kitchen/
22-
kitchen.vagrant.yml
23-
24-
yaml-files:
25-
# Default settings
26-
- '*.yaml'
27-
- '*.yml'
28-
- .salt-lint
29-
- .yamllint
30-
# SaltStack Formulas additional settings
31-
- '*.example'
32-
- test/**/*.sls
33-
347
rules:
358
empty-values:
369
forbid-in-block-mappings: true

0 commit comments

Comments
 (0)