From c8f9dd44e610b250dc85a1e1f9c5475866902b5c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 8 Jun 2022 23:52:35 +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 --- .github/workflows/kitchen.vagrant.yml | 1 - .gitlab-ci.yml | 12 +--- .pre-commit-config.yaml | 14 +++- .travis.yml | 12 +--- kitchen.vagrant.yml | 9 --- kitchen.yml | 66 ------------------- .../default/files/_mapdata/debian-9.yaml | 6 +- test/salt/pillar/top.sls | 2 - 8 files changed, 18 insertions(+), 104 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index f7dc712..b99aad0 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -19,7 +19,6 @@ jobs: - default-freebsd-130-3004-0-py3 - default-freebsd-123-3004-0-py3 - default-openbsd-70-3003-3-py3 - - default-openbsd-69-3002-6-py3 - default-windows-10-latest-py3 - default-windows-81-latest-py3 steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afbe8fa..8047e7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,6 @@ rubocop: # 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-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'} # 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'} @@ -187,7 +185,7 @@ default-rockylinux-8-3004-1-py3: {extends: '.test_instance'} default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} default-debian-10-3003-4-py3: {extends: '.test_instance'} -# default-debian-9-3003-4-py3: {extends: '.test_instance'} +default-debian-9-3003-4-py3: {extends: '.test_instance'} # default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} # default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'} @@ -196,14 +194,6 @@ default-centos-7-3003-4-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 d1824fe..b75e85e 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 @@ -139,7 +137,7 @@ jobs: - env: INSTANCE=default-opensuse-leap-153-3004-0-py3 - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3 - env: INSTANCE=default-debian-10-3003-4-py3 - # - env: INSTANCE=default-debian-9-3003-4-py3 + - env: INSTANCE=default-debian-9-3003-4-py3 # - env: INSTANCE=default-ubuntu-2004-3003-4-py3 - env: INSTANCE=default-ubuntu-1804-3003-4-py3 # - env: INSTANCE=default-centos-stream8-3003-4-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.vagrant.yml b/kitchen.vagrant.yml index 417f94e..4443752 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -51,15 +51,6 @@ platforms: verifier: inputs: saltmajorversion: 3003 - - name: openbsd-69-3002-6-py3 - driver: - box: myii/openbsd-6.9-3002.6-py3 - ssh: - shell: /bin/ksh - synced_folders: [] - verifier: - inputs: - saltmajorversion: 3002 - name: windows-10-latest-py3 driver: box: techneg/win10x64-pro-salt diff --git a/kitchen.yml b/kitchen.yml index 3801d36..e4203b3 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -174,12 +174,6 @@ platforms: verifier: inputs: saltmajorversion: 3004 - - name: fedora-34-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-34 - verifier: - inputs: - saltmajorversion: 3004 - name: opensuse-leap-153-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.3 @@ -317,12 +311,6 @@ platforms: verifier: inputs: saltmajorversion: 3004 - - name: fedora-34-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:fedora-34 - verifier: - inputs: - saltmajorversion: 3004 - name: amazonlinux-2-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:amazonlinux-2 @@ -461,60 +449,6 @@ platforms: inputs: saltmajorversion: 3003 - ## SALT `3002.8` - - name: debian-10-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:debian-10 - run_command: /lib/systemd/systemd - verifier: - inputs: - saltmajorversion: 3002 - - name: debian-9-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:debian-9 - run_command: /lib/systemd/systemd - verifier: - inputs: - saltmajorversion: 3002 - - name: ubuntu-2004-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - verifier: - inputs: - saltmajorversion: 3002 - - name: ubuntu-1804-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - verifier: - inputs: - saltmajorversion: 3002 - - name: centos-7-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:centos-7 - verifier: - inputs: - saltmajorversion: 3002 - - name: amazonlinux-2-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:amazonlinux-2 - verifier: - inputs: - saltmajorversion: 3002 - - name: oraclelinux-8-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:oraclelinux-8 - verifier: - inputs: - saltmajorversion: 3002 - - name: oraclelinux-7-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:oraclelinux-7 - verifier: - inputs: - saltmajorversion: 3002 - verifier: # https://www.inspec.io/ name: inspec diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 3b6ae30..9ed1616 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -88,14 +88,14 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg + https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3003/salt-archive-keyring.gpg pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3002' + release: '3003' restart_via_at: false retry_options: attempts: 5 diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls index a7663c7..06db9ab 100644 --- a/test/salt/pillar/top.sls +++ b/test/salt/pillar/top.sls @@ -8,6 +8,4 @@ base: - v3004-py3 'G@saltversioninfo:0:3003 and G@pythonversion:0:3': - v3003-py3 - 'G@saltversioninfo:0:3002 and G@pythonversion:0:3': - - v3002-py3 ...