Skip to content

chore: apply template copier-ssf-ci at v1.1.3 #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dafyddj merged 5 commits into from
May 10, 2025
Merged

chore: apply template copier-ssf-ci at v1.1.3 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e4d506
chore: apply template `copier-ssf-ci` at v1.1.3
dafyddj May 9, 2025
7c24898
ci: pick platforms to run CI
dafyddj May 9, 2025
bed496b
chore(deps): update template `copier-ssf-ci` to v1.1.5
dafyddj May 10, 2025
5b03baf
ci: disable Vagrant tests
dafyddj May 10, 2025
104862d
chore(deps): update template `copier-ssf-ci` to v1.1.6
dafyddj May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .copier-answers.ssf-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v1.1.6
_src_path: https://github.com/dafyddj/copier-ssf-ci
formula_name: vault
28 changes: 28 additions & 0 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
enabledManagers: [
'copier',
'git-submodules',
],
extends: [
'config:recommended',
],
automergeStrategy: 'merge-commit',
'git-submodules': {
'enabled': true
},
packageRules: [
{
matchFileNames: [
'template/**'
],
semanticCommitType: 'fix',
},
{
automerge: true,
matchManagers: [
'git-submodules'
],
},
],
}
8 changes: 8 additions & 0 deletions .github/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
# These settings are synced to GitHub by https://probot.github.io/apps/settings/

repository:
# See https://docs.github.com/en/rest/reference/repos#update-a-repository
# for all available settings

allow_squash_merge: false
3 changes: 2 additions & 1 deletion .github/workflows/kitchen.vagrant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# vim: ft=yaml
---
name: 'Kitchen Vagrant (FreeBSD)'
'on': ['push', 'pull_request']
'on': # ['push', 'pull_request']
disabled: {}

env:
KITCHEN_LOCAL_YAML: 'kitchen.vagrant.yml'
Expand Down
161 changes: 70 additions & 91 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
stage_release: &stage_release 'release'
stage_test: &stage_test 'test'
# `image`
image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
image_precommit: &image_precommit
name: 'myii/ssf-pre-commit:2.9.2'
entrypoint: ['/bin/bash', '-c']
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
# yamllint disable rule:line-length
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.86@sha256:8c5ba8332790247b0bdd0e0f7a87fee169aa5405197a9cca4e79be30e45b0269'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.55@sha256:1e4685e62a274c227c9cb08c80750e9961834777b53bb9e7c5faf6c0d8a07d1e'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.55@sha256:1e4685e62a274c227c9cb08c80750e9961834777b53bb9e7c5faf6c0d8a07d1e'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.20@sha256:16ef5422c57c3ac998e15993e49ef76a6ff116b1faeecf61bb53309510f2a0b9'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
# `services`
services_docker_dind: &services_docker_dind
- 'docker:dind'
- 'docker:dind@sha256:3a861ec98623bd6014610291123751dc19e0c6d474ac3b38767771791ac0eb5e'
# yamllint enable rule:line-length
# `variables`
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
# https://bundler.io/v1.16/bundle_config.html
Expand Down Expand Up @@ -131,89 +132,67 @@ rubocop:
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
# yamllint disable rule:line-length
# prod-server-debian-11-tiamat-py3: {extends: '.test_instance'}
# prod-server-debian-10-tiamat-py3: {extends: '.test_instance'}
# prod-server-debian-9-tiamat-py3: {extends: '.test_instance'}
# prod-server-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# prod-server-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-centos-7-tiamat-py3: {extends: '.test_instance'}
# prod-server-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# prod-server-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# prod-server-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
# prod-server-debian-11-master-py3: {extends: '.test_instance'}
debian-11-master-py3: {extends: '.test_instance'}
# prod-server-debian-10-master-py3: {extends: '.test_instance'}
debian-10-master-py3: {extends: '.test_instance'}
# prod-server-debian-9-master-py3: {extends: '.test_instance'}
debian-9-master-py3: {extends: '.test_instance'}
# prod-server-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-ubuntu-2004-master-py3: {extends: '.test_instance'}
ubuntu-2004-master-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-master-py3: {extends: '.test_instance'}
ubuntu-1804-master-py3: {extends: '.test_instance'}
# prod-server-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-centos-7-master-py3: {extends: '.test_instance'}
centos-7-master-py3: {extends: '.test_instance'}
# prod-server-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
# fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-fedora-35-master-py3: {extends: '.test_instance'}
# fedora-35-master-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-153-master-py3: {extends: '.test_instance'}
opensuse-leap-153-master-py3: {extends: '.test_instance'}
# prod-server-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-amazonlinux-2-master-py3: {extends: '.test_instance'}
amazonlinux-2-master-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-master-py3: {extends: '.test_instance'}
oraclelinux-8-master-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-master-py3: {extends: '.test_instance'}
oraclelinux-7-master-py3: {extends: '.test_instance'}
# prod-server-arch-base-latest-master-py3: {extends: '.test_instance'}
arch-base-latest-master-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# prod-server-almalinux-8-master-py3: {extends: '.test_instance'}
almalinux-8-master-py3: {extends: '.test_instance'}
# prod-server-rockylinux-8-master-py3: {extends: '.test_instance'}
rockylinux-8-master-py3: {extends: '.test_instance'}
# prod-server-debian-11-3004-1-py3: {extends: '.test_instance'}
# prod-server-debian-10-3004-1-py3: {extends: '.test_instance'}
# prod-server-debian-9-3004-1-py3: {extends: '.test_instance'}
# prod-server-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
# prod-server-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-centos-7-3004-1-py3: {extends: '.test_instance'}
# prod-server-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-fedora-35-3004-1-py3: {extends: '.test_instance'}
# prod-server-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
# prod-server-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
# prod-server-almalinux-8-3004-1-py3: {extends: '.test_instance'}
# prod-server-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
# prod-server-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-debian-10-3003-4-py3: {extends: '.test_instance'}
# prod-server-debian-9-3003-4-py3: {extends: '.test_instance'}
# prod-server-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
# prod-server-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
# prod-server-centos-7-3003-4-py3: {extends: '.test_instance'}
# prod-server-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
# prod-server-almalinux-8-3003-4-py3: {extends: '.test_instance'}
# Fedora 41+ will permit failure until this PR is merged into kitchen-docker
# https://github.com/test-kitchen/kitchen-docker/pull/427 is merged
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
# https://github.com/saltstack/great-module-migration/issues/14
#
# default-debian-12-master-py3: {extends: '.test_instance'}
# default-debian-11-master-py3: {extends: '.test_instance'}
# default-ubuntu-2404-master-py3: {extends: '.test_instance'}
# default-ubuntu-2204-master-py3: {extends: '.test_instance'}
# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
# default-centos-stream9-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
# default-opensuse-leap-155-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
# default-amazonlinux-2023-master-py3: {extends: '.test_instance'}
# default-fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-40-master-py3: {extends: '.test_instance'}
# default-oraclelinux-9-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
# default-almalinux-9-master-py3: {extends: '.test_instance'}
# default-almalinux-8-master-py3: {extends: '.test_instance'}
# default-rockylinux-9-master-py3: {extends: '.test_instance'}
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
debian-12-3007-1-py3: {extends: '.test_instance'}
debian-11-3007-1-py3: {extends: '.test_instance'}
ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
centos-stream9-3007-1-py3: {extends: '.test_instance'}
# default-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
# default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
# default-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-40-3007-1-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
# default-oraclelinux-9-3007-1-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3007-1-py3: {extends: '.test_instance'}
# default-almalinux-9-3007-1-py3: {extends: '.test_instance'}
# default-almalinux-8-3007-1-py3: {extends: '.test_instance'}
# default-rockylinux-9-3007-1-py3: {extends: '.test_instance'}
# default-rockylinux-8-3007-1-py3: {extends: '.test_instance'}
debian-12-3006-10-py3: {extends: '.test_instance'}
debian-11-3006-10-py3: {extends: '.test_instance'}
ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
ubuntu-2004-3006-10-py3: {extends: '.test_instance'}
centos-stream9-3006-10-py3: {extends: '.test_instance'}
# default-opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
# default-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'}
# default-fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-40-3006-10-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3006-10-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2023-3006-10-py3: {extends: '.test_instance'}
# default-oraclelinux-9-3006-10-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3006-10-py3: {extends: '.test_instance'}
# default-almalinux-9-3006-10-py3: {extends: '.test_instance'}
# default-almalinux-8-3006-10-py3: {extends: '.test_instance'}
# default-rockylinux-9-3006-10-py3: {extends: '.test_instance'}
# default-rockylinux-8-3006-10-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
65 changes: 48 additions & 17 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ci:
autoupdate_schedule: quarterly
skip: []
submodules: false
default_stages: [commit]
default_stages: [pre-commit]
repos:
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
rev: v2.3.0
Expand All @@ -24,46 +24,64 @@ repos:
name: Check commit message using commitlint
description: Lint commit message against @commitlint/config-conventional rules
stages: [commit-msg]
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
- id: commitlint-travis
stages: [manual]
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
always_run: true
additional_dependencies: ['@commitlint/config-conventional@17.1.0']
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.30.1
rev: v1.57.0
hooks:
- id: rubocop
name: Check Ruby files with rubocop
args: [--debug]
always_run: true
pass_filenames: false
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.8.0.4
rev: v0.9.0.6
hooks:
- id: shellcheck
name: Check shell scripts with shellcheck
files: ^.*\.(sh|bash|ksh)$
types: []
- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.32.0
hooks:
- id: yamllint
name: Check YAML syntax with yamllint
args: [--strict, '.']
always_run: true
pass_filenames: false
args: [--strict]
types: [file]
# Files to include
# 1. Obvious YAML files
# 2. `pillar.example` and similar files
# 3. SLS files under directory `test/` which are pillar files
# Files to exclude
# 1. SLS files under directory `test/` which are state files
# 2. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
# 3. YAML files heavily reliant on Jinja
# 4. `.copier-answers.yml` and its variants which are auto-generated
files: |
(?x)^(
.*\.yaml|
.*\.yml|
\.salt-lint|
\.yamllint|
.*\.example|
test/.*\.sls
)$
exclude: |
(?x)^(
\.copier-answers(\..+)?\.ya?ml|
kitchen.vagrant.yml|
test/.*/states/.*\.sls
)$
- repo: https://github.com/warpnet/salt-lint
rev: v0.8.0
rev: v0.9.2
hooks:
- id: salt-lint
name: Check Salt files using salt-lint
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
- repo: https://github.com/myint/rstcheck
rev: 3f929574
rev: v6.2.0
hooks:
- id: rstcheck
name: Check reST files using rstcheck
exclude: 'docs/CHANGELOG.rst'
additional_dependencies: [sphinx==7.2.6]
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
rev: v1.3.2
hooks:
Expand All @@ -73,5 +91,18 @@ repos:
(?x)^(
docs/CHANGELOG.rst|
docs/TOFS_pattern.rst|
docs/CONTRIBUTING_DOCS.rst|
docs/index.rst|
)$
additional_dependencies: [pygments==2.9.0]
additional_dependencies: [pygments==2.16.1]
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 40.5.0
hooks:
- id: renovate-config-validator
name: Check Renovate config with renovate-config-validator
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.33.0
hooks:
- id: check-gitlab-ci
name: Check GitLab CI config with check-jsonschema
args: ["--verbose"]
4 changes: 3 additions & 1 deletion .rstcheck.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[rstcheck]
report=info
ignore_language=rst
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
# salt['config.get']('roles') is misidentified as a Markdown link.
# Ignore for now, but perhaps try to submit a fix upstream in rstcheck
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$|\(rst\) Link is formatted in Markdown style\.)
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Layout/LineLength:
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Max: 88
Metrics/BlockLength:
IgnoredMethods:
AllowedMethods:
- control
- describe
# Increase from default of `25`
Expand Down
27 changes: 0 additions & 27 deletions .yamllint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,6 @@
# Extend the `default` configuration provided by `yamllint`
extends: 'default'

# Files to ignore completely
# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
# 2. All YAML files under directory `.cache/`, introduced during the CI run
# 3. All YAML files under directory `.git/`
# 4. All YAML files under directory `node_modules/`, introduced during the CI run
# 5. Any SLS files under directory `test/`, which are actually state files
# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
ignore: |
.bundle/
.cache/
.git/
node_modules/
test/**/states/**/*.sls
.kitchen/
kitchen.vagrant.yml

yaml-files:
# Default settings
- '*.yaml'
- '*.yml'
- .salt-lint
- .yamllint
# SaltStack Formulas additional settings
- '*.example'
- test/**/*.sls

rules:
empty-values:
forbid-in-block-mappings: true
Expand Down
Loading
Loading