diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 08a160e1..b20f24d2 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -99,13 +99,6 @@ jobs: # - composeclean-fedora-35-master-py3 # - dockeronly-fedora-35-master-py3 - fedora-35-master-py3 - # - archive-fedora-34-master-py3 - # - package-fedora-34-master-py3 - # - repo-fedora-34-master-py3 - # - clean-fedora-34-master-py3 - # - composeclean-fedora-34-master-py3 - # - dockeronly-fedora-34-master-py3 - - fedora-34-master-py3 # - archive-opensuse-leap-153-master-py3 # - package-opensuse-leap-153-master-py3 # - repo-opensuse-leap-153-master-py3 @@ -185,7 +178,6 @@ jobs: # - archive-centos-7-3004-1-py3 # - archive-fedora-36-3004-1-py3 # - archive-fedora-35-3004-1-py3 - # - archive-fedora-34-3004-1-py3 # - archive-amazonlinux-2-3004-1-py3 # - archive-oraclelinux-8-3004-1-py3 # - archive-oraclelinux-7-3004-1-py3 @@ -206,14 +198,6 @@ jobs: # - archive-oraclelinux-8-3003-4-py3 # - archive-oraclelinux-7-3003-4-py3 # - archive-almalinux-8-3003-4-py3 - # - archive-debian-10-3002-8-py3 - # - archive-debian-9-3002-8-py3 - # - archive-ubuntu-2004-3002-8-py3 - # - archive-ubuntu-1804-3002-8-py3 - # - archive-centos-7-3002-8-py3 - # - archive-amazonlinux-2-3002-8-py3 - # - archive-oraclelinux-8-3002-8-py3 - # - archive-oraclelinux-7-3002-8-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2cb381ed..1299a84d 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 772ea9f1..9af49490 100644 --- a/.travis.yml +++ b/.travis.yml @@ -173,13 +173,6 @@ jobs: # - env: INSTANCE=composeclean-fedora-35-master-py3 # - env: INSTANCE=dockeronly-fedora-35-master-py3 - env: INSTANCE=fedora-35-master-py3 - # - env: INSTANCE=archive-fedora-34-master-py3 - # - env: INSTANCE=package-fedora-34-master-py3 - # - env: INSTANCE=repo-fedora-34-master-py3 - # - env: INSTANCE=clean-fedora-34-master-py3 - # - env: INSTANCE=composeclean-fedora-34-master-py3 - # - env: INSTANCE=dockeronly-fedora-34-master-py3 - - env: INSTANCE=fedora-34-master-py3 # - env: INSTANCE=archive-opensuse-leap-153-master-py3 # - env: INSTANCE=package-opensuse-leap-153-master-py3 # - env: INSTANCE=repo-opensuse-leap-153-master-py3 @@ -259,7 +252,6 @@ jobs: # - env: INSTANCE=archive-centos-7-3004-1-py3 # - env: INSTANCE=archive-fedora-36-3004-1-py3 # - env: INSTANCE=archive-fedora-35-3004-1-py3 - # - env: INSTANCE=archive-fedora-34-3004-1-py3 # - env: INSTANCE=archive-amazonlinux-2-3004-1-py3 # - env: INSTANCE=archive-oraclelinux-8-3004-1-py3 # - env: INSTANCE=archive-oraclelinux-7-3004-1-py3 @@ -280,14 +272,6 @@ jobs: # - env: INSTANCE=archive-oraclelinux-8-3003-4-py3 # - env: INSTANCE=archive-oraclelinux-7-3003-4-py3 # - env: INSTANCE=archive-almalinux-8-3003-4-py3 - # - env: INSTANCE=archive-debian-10-3002-8-py3 - # - env: INSTANCE=archive-debian-9-3002-8-py3 - # - env: INSTANCE=archive-ubuntu-2004-3002-8-py3 - # - env: INSTANCE=archive-ubuntu-1804-3002-8-py3 - # - env: INSTANCE=archive-centos-7-3002-8-py3 - # - env: INSTANCE=archive-amazonlinux-2-3002-8-py3 - # - env: INSTANCE=archive-oraclelinux-8-3002-8-py3 - # - env: INSTANCE=archive-oraclelinux-7-3002-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index da2875dc..61aa13b0 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -157,11 +157,6 @@ platforms: image: saltimages/salt-master-py3:fedora-35 provision_command: - dnf install conntrack-tools -y - - name: fedora-34-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-34 - provision_command: - - dnf install conntrack-tools -y - name: opensuse-leap-153-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.3 @@ -282,11 +277,6 @@ platforms: image: saltimages/salt-3004.1-py3:fedora-35 provision_command: - dnf install conntrack-tools -y - - name: fedora-34-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:fedora-34 - provision_command: - - dnf install conntrack-tools -y - name: amazonlinux-2-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:amazonlinux-2 @@ -404,56 +394,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 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - run_command: /lib/systemd/systemd - - name: debian-9-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:debian-9 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-20.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-18.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - run_command: /lib/systemd/systemd - - name: centos-7-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:centos-7 - provision_command: - - yum install conntrack-tools -y - - name: amazonlinux-2-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:amazonlinux-2 - provision_command: - - yum install conntrack-tools -y - - name: oraclelinux-8-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:oraclelinux-8 - provision_command: - - yum install conntrack-tools -y - - name: oraclelinux-7-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:oraclelinux-7 - provision_command: - - yum install conntrack-tools -y - verifier: # https://www.inspec.io/ name: inspec