Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion .copier-answers.ssf-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v1.1.9
_commit: v1.2.0
_src_path: https://github.com/dafyddj/copier-ssf-ci
failure_permitted_pattern: master
formula_name: vault
supported_oses:
- Debian
- Rocky Linux
- Ubuntu
87 changes: 26 additions & 61 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
stage_test: &stage_test 'test'
# `image`
# yamllint disable rule:line-length
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.87@sha256:7d88b7ea69f3cd917995d0e7ea5ce7aae97383db95003319d0c43a1d68372402'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.21@sha256:620cdfaa9c45b4941090e2b557f5f551fbc1189caf13689e5bbfbd5c76885400'
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.88@sha256:80fa0eae4f2736d78a4f3df7699f0bebb7775de6deda3a297dd8d08067bd5e66'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.57@sha256:93cbc1e643c51b086d7c7c7a10e09550027da73c65ec436bb1de2dddf7989a54'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.57@sha256:93cbc1e643c51b086d7c7c7a10e09550027da73c65ec436bb1de2dddf7989a54'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.22@sha256:f125976d867860e46d4a4da3f6fb37567ebca6305fa0751e95530da81ad5de0e'
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@sha256:3a861ec98623bd6014610291123751dc19e0c6d474ac3b38767771791ac0eb5e'
- 'docker:28.1.1-dind@sha256:1e9d444274b295261e49f96635f3d56a615cb3ae2021204160f8ac3cdf8f3b58'
# yamllint enable rule:line-length
# `variables`
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
Expand Down Expand Up @@ -137,62 +137,27 @@ rubocop:
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
# https://github.com/saltstack/great-module-migration/issues/14
#
# debian-12-master-py3: {extends: '.test_instance'}
# debian-11-master-py3: {extends: '.test_instance'}
# ubuntu-2404-master-py3: {extends: '.test_instance'}
# ubuntu-2204-master-py3: {extends: '.test_instance'}
# ubuntu-2004-master-py3: {extends: '.test_instance'}
# centos-stream9-master-py3: {extends: '.test_instance'}
# opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
# opensuse-leap-155-master-py3: {extends: '.test_instance'}
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
# amazonlinux-2023-master-py3: {extends: '.test_instance'}
# fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
# fedora-40-master-py3: {extends: '.test_instance'}
# oraclelinux-9-master-py3: {extends: '.test_instance'}
# oraclelinux-8-master-py3: {extends: '.test_instance'}
# almalinux-9-master-py3: {extends: '.test_instance'}
# almalinux-8-master-py3: {extends: '.test_instance'}
# rockylinux-9-master-py3: {extends: '.test_instance'}
# 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'}
# opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
# opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
# opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
# fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
# fedora-40-3007-1-py3: {extends: '.test_instance'}
# amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'}
# amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
# oraclelinux-9-3007-1-py3: {extends: '.test_instance'}
# oraclelinux-8-3007-1-py3: {extends: '.test_instance'}
# almalinux-9-3007-1-py3: {extends: '.test_instance'}
# almalinux-8-3007-1-py3: {extends: '.test_instance'}
# rockylinux-9-3007-1-py3: {extends: '.test_instance'}
# 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'}
# opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
# opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
# opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'}
# fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
# fedora-40-3006-10-py3: {extends: '.test_instance'}
# amazonlinux-2-3006-10-py3: {extends: '.test_instance_failure_permitted'}
# amazonlinux-2023-3006-10-py3: {extends: '.test_instance'}
# oraclelinux-9-3006-10-py3: {extends: '.test_instance'}
# oraclelinux-8-3006-10-py3: {extends: '.test_instance'}
# almalinux-9-3006-10-py3: {extends: '.test_instance'}
# almalinux-8-3006-10-py3: {extends: '.test_instance'}
# rockylinux-9-3006-10-py3: {extends: '.test_instance'}
# rockylinux-8-3006-10-py3: {extends: '.test_instance'}
debian-12-master: {extends: '.test_instance_failure_permitted'}
debian-11-master: {extends: '.test_instance_failure_permitted'}
rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
debian-12-3007-2: {extends: '.test_instance'}
debian-11-3007-2: {extends: '.test_instance'}
rockylinux-9-3007-2: {extends: '.test_instance'}
rockylinux-8-3007-2: {extends: '.test_instance'}
ubuntu-2404-3007-2: {extends: '.test_instance'}
ubuntu-2204-3007-2: {extends: '.test_instance'}
ubuntu-2004-3007-2: {extends: '.test_instance'}
debian-12-3006-10: {extends: '.test_instance'}
debian-11-3006-10: {extends: '.test_instance'}
rockylinux-9-3006-10: {extends: '.test_instance'}
rockylinux-8-3006-10: {extends: '.test_instance'}
ubuntu-2404-3006-10: {extends: '.test_instance'}
ubuntu-2204-3006-10: {extends: '.test_instance'}
ubuntu-2004-3006-10: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
stages: [commit-msg]
additional_dependencies: ['@commitlint/config-conventional@17.1.0']
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.75.5
rev: v1.75.6
hooks:
- id: rubocop
name: Check Ruby files with rubocop
Expand Down Expand Up @@ -96,7 +96,7 @@ repos:
)$
additional_dependencies: [pygments==2.16.1]
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 40.10.4
rev: 40.19.0
hooks:
- id: renovate-config-validator
name: Check Renovate config with renovate-config-validator
Expand Down
Loading
Loading