Skip to content

Commit 600c3b9

Browse files
dafyddjdafyddj
authored
Merge pull request #78 from sylvainfaivre/ci
ci: use latest test images
2 parents bea590b + 222aa6c commit 600c3b9

File tree

5 files changed

+481
-313
lines changed

5 files changed

+481
-313
lines changed

‎.gitlab-ci.yml

+15-44
Original file line numberDiff line numberDiff line change
@@ -13,11 +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 'myii/ssf-dind-ruby:2.7.1-r3'
18-
image_precommit: &image_precommit
19-
name: 'myii/ssf-pre-commit:2.9.2'
20-
entrypoint: ['/bin/bash', '-c']
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'
2120
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
2221
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
2322
# `services`
@@ -131,46 +130,18 @@ rubocop:
131130
# Make sure the instances listed below match up with
132131
# the `platforms` defined in `kitchen.yml`
133132
# yamllint disable rule:line-length
134-
# repositories-debian-11-tiamat-py3: {extends: '.test_instance'}
135-
# repositories-debian-10-tiamat-py3: {extends: '.test_instance'}
136-
# repositories-debian-9-tiamat-py3: {extends: '.test_instance'}
137-
# repositories-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
138-
# repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
139-
# repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
140-
# repositories-debian-11-master-py3: {extends: '.test_instance'}
141-
# preferences-debian-11-master-py3: {extends: '.test_instance'}
142-
# unattended-debian-11-master-py3: {extends: '.test_instance'}
133+
debian-12-master-py3: {extends: '.test_instance'}
143134
debian-11-master-py3: {extends: '.test_instance'}
144-
# repositories-debian-10-master-py3: {extends: '.test_instance'}
145-
# preferences-debian-10-master-py3: {extends: '.test_instance'}
146-
# unattended-debian-10-master-py3: {extends: '.test_instance'}
147-
debian-10-master-py3: {extends: '.test_instance'}
148-
# repositories-debian-9-master-py3: {extends: '.test_instance'}
149-
# preferences-debian-9-master-py3: {extends: '.test_instance'}
150-
# unattended-debian-9-master-py3: {extends: '.test_instance'}
151-
debian-9-master-py3: {extends: '.test_instance'}
152-
# repositories-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
153-
# preferences-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
154-
# unattended-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
155-
ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
156-
# repositories-ubuntu-2004-master-py3: {extends: '.test_instance'}
157-
# preferences-ubuntu-2004-master-py3: {extends: '.test_instance'}
158-
# unattended-ubuntu-2004-master-py3: {extends: '.test_instance'}
159-
ubuntu-2004-master-py3: {extends: '.test_instance'}
160-
# repositories-ubuntu-1804-master-py3: {extends: '.test_instance'}
161-
# preferences-ubuntu-1804-master-py3: {extends: '.test_instance'}
162-
# unattended-ubuntu-1804-master-py3: {extends: '.test_instance'}
163-
ubuntu-1804-master-py3: {extends: '.test_instance'}
164-
# repositories-debian-11-3004-1-py3: {extends: '.test_instance'}
165-
# repositories-debian-10-3004-1-py3: {extends: '.test_instance'}
166-
# repositories-debian-9-3004-1-py3: {extends: '.test_instance'}
167-
# repositories-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
168-
# repositories-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
169-
# repositories-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
170-
# repositories-debian-10-3003-4-py3: {extends: '.test_instance'}
171-
# repositories-debian-9-3003-4-py3: {extends: '.test_instance'}
172-
# repositories-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
173-
# repositories-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
135+
ubuntu-2404-master-py3: {extends: '.test_instance'}
136+
ubuntu-2204-master-py3: {extends: '.test_instance'}
137+
debian-12-3007-1-py3: {extends: '.test_instance'}
138+
debian-11-3007-1-py3: {extends: '.test_instance'}
139+
ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
140+
ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
141+
debian-12-3006-10-py3: {extends: '.test_instance'}
142+
debian-11-3006-10-py3: {extends: '.test_instance'}
143+
ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
144+
ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
174145
# yamllint enable rule:line-length
175146

176147
###############################################################################

‎.pre-commit-config.yaml

+34-16
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,62 @@ repos:
2424
name: Check commit message using commitlint
2525
description: Lint commit message against @commitlint/config-conventional rules
2626
stages: [commit-msg]
27-
additional_dependencies: ['@commitlint/[email protected]']
28-
- id: commitlint-travis
29-
stages: [manual]
30-
additional_dependencies: ['@commitlint/[email protected]']
31-
always_run: true
27+
additional_dependencies: ['@commitlint/[email protected]']
3228
- repo: https://github.com/rubocop-hq/rubocop
33-
rev: v1.30.1
29+
rev: v1.57.0
3430
hooks:
3531
- id: rubocop
3632
name: Check Ruby files with rubocop
3733
args: [--debug]
38-
always_run: true
39-
pass_filenames: false
4034
- repo: https://github.com/shellcheck-py/shellcheck-py
41-
rev: v0.8.0.4
35+
rev: v0.9.0.6
4236
hooks:
4337
- id: shellcheck
4438
name: Check shell scripts with shellcheck
4539
files: ^.*\.(sh|bash|ksh)$
4640
types: []
4741
- repo: https://github.com/adrienverge/yamllint
48-
rev: v1.26.3
42+
rev: v1.32.0
4943
hooks:
5044
- id: yamllint
5145
name: Check YAML syntax with yamllint
52-
args: [--strict, '.']
53-
always_run: true
54-
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+
)$
5570
- repo: https://github.com/warpnet/salt-lint
56-
rev: v0.8.0
71+
rev: v0.9.2
5772
hooks:
5873
- id: salt-lint
5974
name: Check Salt files using salt-lint
6075
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
6176
- repo: https://github.com/myint/rstcheck
62-
rev: 3f929574
77+
rev: v6.2.0
6378
hooks:
6479
- id: rstcheck
6580
name: Check reST files using rstcheck
6681
exclude: 'docs/CHANGELOG.rst'
82+
additional_dependencies: [sphinx==7.2.6]
6783
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
6884
rev: v1.3.2
6985
hooks:
@@ -73,5 +89,7 @@ repos:
7389
(?x)^(
7490
docs/CHANGELOG.rst|
7591
docs/TOFS_pattern.rst|
92+
docs/CONTRIBUTING_DOCS.rst|
93+
docs/index.rst|
7694
)$
77-
additional_dependencies: [pygments==2.9.0]
95+
additional_dependencies: [pygments==2.16.1]

‎Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure
1717

1818
gem 'kitchen-inspec', '>= 2.5.0'
1919
gem 'kitchen-salt', '>= 0.7.2'
20+
21+
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
22+
gem 'net-ssh', '>= 7.0.0'

0 commit comments

Comments
 (0)