From 3880cd3a2bd8ac6d2482b0e9a2365db2db9aff2a Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 9 Jun 2022 00:03:01 +0100
Subject: [PATCH] ci: update `pre-commit` configuration inc. for pre-commit.ci
[skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/450
---
.gitlab-ci.yml | 10 ----------
.pre-commit-config.yaml | 14 +++++++++++++-
.travis.yml | 10 ----------
kitchen.yml | 36 ------------------------------------
4 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a58005..9e0aa88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,7 +154,6 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-7-master-py3: {extends: '.test_instance'}
# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-35-master-py3: {extends: '.test_instance'}
-# default-fedora-34-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -175,7 +174,6 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
@@ -196,14 +194,6 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-debian-10-3002-8-py3: {extends: '.test_instance'}
-# default-debian-9-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
-# default-centos-7-3002-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length
###############################################################################
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2cb381e..1299a84 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,6 +3,18 @@
---
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
+ci:
+ autofix_commit_msg: |
+ ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
+
+ For more information, see https://pre-commit.ci
+ autofix_prs: true
+ autoupdate_branch: ''
+ autoupdate_commit_msg: |
+ ci(pre-commit.ci): perform `pre-commit` autoupdate
+ autoupdate_schedule: quarterly
+ skip: []
+ submodules: false
default_stages: [commit]
repos:
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@@ -18,7 +30,7 @@ repos:
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
always_run: true
- repo: https://github.com/rubocop-hq/rubocop
- rev: v1.25.1
+ rev: v1.30.1
hooks:
- id: rubocop
name: Check Ruby files with rubocop
diff --git a/.travis.yml b/.travis.yml
index 8269fad..c00d167 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,7 +106,6 @@ jobs:
# - env: INSTANCE=default-centos-7-master-py3
# - env: INSTANCE=default-fedora-36-master-py3
# - env: INSTANCE=default-fedora-35-master-py3
- # - env: INSTANCE=default-fedora-34-master-py3
# - env: INSTANCE=default-opensuse-leap-153-master-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
# - env: INSTANCE=default-amazonlinux-2-master-py3
@@ -127,7 +126,6 @@ jobs:
# - env: INSTANCE=default-centos-7-3004-1-py3
# - env: INSTANCE=default-fedora-36-3004-1-py3
# - env: INSTANCE=default-fedora-35-3004-1-py3
- # - env: INSTANCE=default-fedora-34-3004-1-py3
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
@@ -148,14 +146,6 @@ jobs:
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3
# - env: INSTANCE=default-almalinux-8-3003-4-py3
- # - env: INSTANCE=default-debian-10-3002-8-py3
- # - env: INSTANCE=default-debian-9-3002-8-py3
- # - env: INSTANCE=default-ubuntu-2004-3002-8-py3
- # - env: INSTANCE=default-ubuntu-1804-3002-8-py3
- # - env: INSTANCE=default-centos-7-3002-8-py3
- # - env: INSTANCE=default-amazonlinux-2-3002-8-py3
- # - env: INSTANCE=default-oraclelinux-8-3002-8-py3
- # - env: INSTANCE=default-oraclelinux-7-3002-8-py3
## Define the release stage that runs `semantic-release`
- stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index 237738a..ccf41ce 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -103,9 +103,6 @@ platforms:
- name: fedora-35-master-py3
driver:
image: saltimages/salt-master-py3:fedora-35
- - name: fedora-34-master-py3
- driver:
- image: saltimages/salt-master-py3:fedora-34
- name: opensuse-leap-153-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -183,9 +180,6 @@ platforms:
- name: fedora-35-3004-1-py3
driver:
image: saltimages/salt-3004.1-py3:fedora-35
- - name: fedora-34-3004-1-py3
- driver:
- image: saltimages/salt-3004.1-py3:fedora-34
- name: amazonlinux-2-3004-1-py3
driver:
image: saltimages/salt-3004.1-py3:amazonlinux-2
@@ -264,36 +258,6 @@ platforms:
driver:
image: saltimages/salt-3003.4-py3:almalinux-8
- ## SALT `3002.8`
- - name: debian-10-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:debian-10
- run_command: /lib/systemd/systemd
- - name: debian-9-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:debian-9
- run_command: /lib/systemd/systemd
- - name: ubuntu-2004-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:ubuntu-20.04
- run_command: /lib/systemd/systemd
- - name: ubuntu-1804-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:ubuntu-18.04
- run_command: /lib/systemd/systemd
- - name: centos-7-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:centos-7
- - name: amazonlinux-2-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:amazonlinux-2
- - name: oraclelinux-8-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:oraclelinux-8
- - name: oraclelinux-7-3002-8-py3
- driver:
- image: saltimages/salt-3002.8-py3:oraclelinux-7
-
verifier:
# https://www.inspec.io/
name: inspec