diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78e5bc3..8691d4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,6 @@ redhat8-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} centos-centos-7-master-py3: {extends: '.test_instance'} # fedora-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} # fedora-fedora-35-master-py3: {extends: '.test_instance'} -# fedora-fedora-34-master-py3: {extends: '.test_instance'} suse-opensuse-leap-153-master-py3: {extends: '.test_instance'} suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} amazon-amazonlinux-2-master-py3: {extends: '.test_instance'} @@ -175,7 +174,6 @@ redhat8-rockylinux-8-master-py3: {extends: '.test_instance'} # centos-centos-7-3004-1-py3: {extends: '.test_instance'} # fedora-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'} # fedora-fedora-35-3004-1-py3: {extends: '.test_instance'} -# fedora-fedora-34-3004-1-py3: {extends: '.test_instance'} # amazon-amazonlinux-2-3004-1-py3: {extends: '.test_instance'} # redhat8-oraclelinux-8-3004-1-py3: {extends: '.test_instance'} # centos-oraclelinux-7-3004-1-py3: {extends: '.test_instance'} @@ -196,14 +194,6 @@ redhat8-rockylinux-8-master-py3: {extends: '.test_instance'} # redhat8-oraclelinux-8-3003-4-py3: {extends: '.test_instance'} # centos-oraclelinux-7-3003-4-py3: {extends: '.test_instance'} # redhat8-almalinux-8-3003-4-py3: {extends: '.test_instance'} -# debian-debian-10-3002-8-py3: {extends: '.test_instance'} -# debian-debian-9-3002-8-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-2004-3002-8-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1804-3002-8-py3: {extends: '.test_instance'} -# centos-centos-7-3002-8-py3: {extends: '.test_instance'} -# amazon-amazonlinux-2-3002-8-py3: {extends: '.test_instance'} -# redhat8-oraclelinux-8-3002-8-py3: {extends: '.test_instance'} -# centos-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 e1f1f50..c6743e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,7 +106,6 @@ jobs: - env: INSTANCE=centos-centos-7-master-py3 # - env: INSTANCE=fedora-fedora-36-master-py3 # - env: INSTANCE=fedora-fedora-35-master-py3 - # - env: INSTANCE=fedora-fedora-34-master-py3 - env: INSTANCE=suse-opensuse-leap-153-master-py3 - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3 - env: INSTANCE=amazon-amazonlinux-2-master-py3 @@ -127,7 +126,6 @@ jobs: # - env: INSTANCE=centos-centos-7-3004-1-py3 # - env: INSTANCE=fedora-fedora-36-3004-1-py3 # - env: INSTANCE=fedora-fedora-35-3004-1-py3 - # - env: INSTANCE=fedora-fedora-34-3004-1-py3 # - env: INSTANCE=amazon-amazonlinux-2-3004-1-py3 # - env: INSTANCE=redhat8-oraclelinux-8-3004-1-py3 # - env: INSTANCE=centos-oraclelinux-7-3004-1-py3 @@ -148,14 +146,6 @@ jobs: # - env: INSTANCE=redhat8-oraclelinux-8-3003-4-py3 # - env: INSTANCE=centos-oraclelinux-7-3003-4-py3 # - env: INSTANCE=redhat8-almalinux-8-3003-4-py3 - # - env: INSTANCE=debian-debian-10-3002-8-py3 - # - env: INSTANCE=debian-debian-9-3002-8-py3 - # - env: INSTANCE=ubuntu-ubuntu-2004-3002-8-py3 - # - env: INSTANCE=ubuntu-ubuntu-1804-3002-8-py3 - # - env: INSTANCE=centos-centos-7-3002-8-py3 - # - env: INSTANCE=amazon-amazonlinux-2-3002-8-py3 - # - env: INSTANCE=redhat8-oraclelinux-8-3002-8-py3 - # - env: INSTANCE=centos-oraclelinux-7-3002-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index cd73984..b852f03 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -127,9 +127,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 @@ -219,9 +216,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 @@ -308,44 +302,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 install --reinstall -y udev - - apt-get install -y snapd - 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 install --reinstall -y udev - - apt-get install -y snapd - 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 @@ -368,8 +324,6 @@ suites: - debian-9-3004-1-py3 - debian-10-3003-4-py3 - debian-9-3003-4-py3 - - debian-10-3002-8-py3 - - debian-9-3002-8-py3 provisioner: dependencies: - name: node @@ -404,8 +358,6 @@ suites: - ubuntu-1804-3004-1-py3 - ubuntu-2004-3003-4-py3 - ubuntu-1804-3003-4-py3 - - ubuntu-2004-3002-8-py3 - - ubuntu-1804-3002-8-py3 provisioner: dependencies: - name: golang @@ -431,10 +383,8 @@ suites: includes: - fedora-36-master-py3 - fedora-35-master-py3 - - fedora-34-master-py3 - fedora-36-3004-1-py3 - fedora-35-3004-1-py3 - - fedora-34-3004-1-py3 provisioner: state_top: base: @@ -468,7 +418,6 @@ suites: - centos-stream8-3003-4-py3 - oraclelinux-8-3003-4-py3 - almalinux-8-3003-4-py3 - - oraclelinux-8-3002-8-py3 provisioner: dependencies: - name: epel @@ -500,8 +449,6 @@ suites: - oraclelinux-7-3004-1-py3 - centos-7-3003-4-py3 - oraclelinux-7-3003-4-py3 - - centos-7-3002-8-py3 - - oraclelinux-7-3002-8-py3 provisioner: dependencies: - name: epel @@ -529,7 +476,6 @@ suites: - amazonlinux-2-master-py3 - amazonlinux-2-3004-1-py3 - amazonlinux-2-3003-4-py3 - - amazonlinux-2-3002-8-py3 provisioner: dependencies: - name: epel