From b7d15c9dd049ad34f6a257752b56fbfa612f2739 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 17 May 2022 13:22:03 +0100 Subject: [PATCH 1/9] chore(gemfile.lock): update to latest gem versions (2022-W20) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/444 --- Gemfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 93d667a2..da134ace 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255 + revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057 branch: ssf specs: - inspec (5.15.0) + inspec (5.16.2) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.15.0) + inspec-core (= 5.16.2) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.15.0) + inspec-core (5.16.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -89,7 +89,7 @@ GEM aws-sdk-cloudformation (1.68.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.64.0) + aws-sdk-cloudfront (1.65.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.39.0) @@ -128,7 +128,7 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.130.2) + aws-sdk-core (3.131.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.312.0) + aws-sdk-ec2 (1.315.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -157,7 +157,7 @@ GEM aws-sdk-efs (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.74.0) + aws-sdk-eks (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.77.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.83.0) + aws-sdk-lambda (1.84.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -379,7 +379,7 @@ GEM concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.6.1) - json (2.6.1) + json (2.6.2) jwt (2.3.0) kitchen-inspec (2.5.2) hashie (>= 3.4, <= 5.0) @@ -450,7 +450,7 @@ GEM rainbow (3.1.1) rake (13.0.6) regexp_parser (2.4.0) - representable (3.1.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) @@ -481,7 +481,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) + rubocop-ast (1.18.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) From 1741c8d4e282cbac920321655b40cf1832107fac Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 30 May 2022 17:29:10 +0100 Subject: [PATCH 2/9] chore(gemfile.lock): update to latest gem versions (2022-W22) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/447 --- Gemfile | 2 +- Gemfile.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index 8020f666..f4192913 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true -source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org' +source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org') # Install the `inspec` gem using `git` because versions after `4.22.22` # suppress diff output; this version fixes this for our uses. diff --git a/Gemfile.lock b/Gemfile.lock index da134ace..a81c1f20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057 + revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea branch: ssf specs: - inspec (5.16.2) + inspec (5.17.4) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.16.2) + inspec-core (= 5.17.4) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.16.2) + inspec-core (5.17.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.587.0) + aws-partitions (1.594.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.76.0) + aws-sdk-apigateway (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -86,7 +86,7 @@ GEM aws-sdk-budgets (1.49.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.68.0) + aws-sdk-cloudformation (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.65.0) @@ -107,7 +107,7 @@ GEM aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.52.0) + aws-sdk-cloudwatchlogs (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.51.0) @@ -128,11 +128,11 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.0) + aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) + jmespath (~> 1, >= 1.6.1) aws-sdk-costandusagereportservice (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.315.0) + aws-sdk-ec2 (1.317.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.77.0) + aws-sdk-elasticache (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -199,7 +199,7 @@ GEM aws-sdk-kinesis (1.41.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.56.0) + aws-sdk-kms (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-lambda (1.84.0) @@ -211,7 +211,7 @@ GEM aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.22.0) + aws-sdk-networkmanager (1.23.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -372,7 +372,7 @@ GEM rexml (~> 3.0) hashie (4.1.0) highline (2.0.3) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.10.0) @@ -396,7 +396,7 @@ GEM tty-box (~> 0.6) tty-prompt (~> 0.20) little-plugger (1.1.4) - logging (2.3.0) + logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) memoist (0.16.2) @@ -449,7 +449,7 @@ GEM public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.4.0) + regexp_parser (2.5.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -487,7 +487,7 @@ GEM ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) - semverse (3.0.0) + semverse (3.0.2) signet (0.16.1) addressable (~> 2.8) faraday (>= 0.17.5, < 3.0) @@ -641,7 +641,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) From 35b9d549df58464c03ae9f1f7c32f385ea1df988 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 7 Jun 2022 23:31:14 +0100 Subject: [PATCH 3/9] chore(gemfile.lock): update to latest gem versions (2022-W23) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/449 --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a81c1f20..ce726b22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea + revision: 6bedc829b7fcec035311d8c6086db5d59414428c branch: ssf specs: - inspec (5.17.4) + inspec (5.17.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.17.4) + inspec-core (= 5.17.9) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.17.4) + inspec-core (5.17.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.594.0) + aws-partitions (1.596.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -226,7 +226,7 @@ GEM aws-sdk-redshift (1.82.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.62.0) + aws-sdk-route53 (1.63.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.40.0) @@ -380,8 +380,8 @@ GEM inifile (3.0.0) jmespath (1.6.1) json (2.6.2) - jwt (2.3.0) - kitchen-inspec (2.5.2) + jwt (2.4.0) + kitchen-inspec (2.6.0) hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 6.0) test-kitchen (>= 2.7, < 4) @@ -405,7 +405,7 @@ GEM minitest (5.15.0) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.16) + mixlib-install (3.12.19) mixlib-shellout mixlib-versioning thor @@ -425,7 +425,7 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.0) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) From c8f9dd44e610b250dc85a1e1f9c5475866902b5c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 8 Jun 2022 23:52:35 +0100 Subject: [PATCH 4/9] 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 f7dc7120..b99aad0e 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 afbe8fae..8047e7bc 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 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 d1824fe1..b75e85e2 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 417f94e0..44437525 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 3801d36d..e4203b3d 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 3b6ae306..9ed16160 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 a7663c79..06db9ab3 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 ... From b593a5b862e86854e2479695557d83890494a988 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 15 Jun 2022 23:06:26 +0100 Subject: [PATCH 5/9] chore(gemfile.lock): update to latest gem versions (2022-W24) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/452 --- Gemfile.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ce726b22..7b4c66e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 6bedc829b7fcec035311d8c6086db5d59414428c + revision: fdc592e2c7b999166f404ae28119866e805c3cd2 branch: ssf specs: - inspec (5.17.9) + inspec (5.18.5) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.17.9) + inspec-core (= 5.18.5) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.17.9) + inspec-core (5.18.5) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.596.0) + aws-partitions (1.598.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -83,7 +83,7 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.49.0) + aws-sdk-budgets (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudformation (1.69.0) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.317.0) + aws-sdk-ec2 (1.318.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -190,7 +190,7 @@ GEM aws-sdk-guardduty (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.68.0) + aws-sdk-iam (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.49.0) @@ -223,7 +223,7 @@ GEM aws-sdk-rds (1.146.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.82.0) + aws-sdk-redshift (1.83.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.63.0) @@ -380,15 +380,15 @@ GEM inifile (3.0.0) jmespath (1.6.1) json (2.6.2) - jwt (2.4.0) - kitchen-inspec (2.6.0) + jwt (2.4.1) + kitchen-inspec (2.6.1) hashie (>= 3.4, <= 5.0) - inspec (>= 2.2.64, < 6.0) + inspec (>= 2.2.64, < 7.0) test-kitchen (>= 2.7, < 4) kitchen-salt (0.7.2) hashie (>= 3.5) test-kitchen (>= 1.4) - kitchen-vagrant (1.11.0) + kitchen-vagrant (1.12.0) test-kitchen (>= 1.4, < 4) license-acceptance (2.1.13) pastel (~> 0.7) @@ -402,8 +402,8 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.15.0) - mixlib-config (3.0.9) + minitest (5.16.0) + mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) mixlib-shellout @@ -425,7 +425,7 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) multi_json (1.15.0) - multipart-post (2.2.0) + multipart-post (2.2.3) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) @@ -499,7 +499,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.2.2) + test-kitchen (3.3.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) From 7772142051c47ead35c5b11cfb02e6d05074c748 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 30 Jun 2022 23:09:19 +0100 Subject: [PATCH 6/9] chore(gemfile.lock): update to latest gem versions (2022-W26) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/453 --- Gemfile.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7b4c66e6..15bc27b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: fdc592e2c7b999166f404ae28119866e805c3cd2 + revision: da3b324893676451fbe419cb11dff91372a9bb9e branch: ssf specs: - inspec (5.18.5) + inspec (5.18.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.18.5) + inspec-core (= 5.18.9) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.18.5) + inspec-core (5.18.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.598.0) + aws-partitions (1.602.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.77.0) + aws-sdk-apigateway (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -74,7 +74,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.53.0) + aws-sdk-athena (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -128,7 +128,7 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.1) + aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -139,10 +139,10 @@ GEM aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.74.0) + aws-sdk-dynamodb (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.318.0) + aws-sdk-ec2 (1.320.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecrpublic (1.12.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.99.0) + aws-sdk-ecs (1.100.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.54.0) @@ -169,7 +169,7 @@ GEM aws-sdk-elasticloadbalancing (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.77.0) + aws-sdk-elasticloadbalancingv2 (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.65.0) @@ -187,13 +187,13 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.57.0) + aws-sdk-guardduty (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.49.0) + aws-sdk-kafka (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.41.0) @@ -245,7 +245,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.65.0) + aws-sdk-securityhub (1.67.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -402,7 +402,7 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.0) + minitest (5.16.1) mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) @@ -488,9 +488,9 @@ GEM rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.2) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) @@ -517,7 +517,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.9.2) + train (3.10.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -528,7 +528,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.9.2) + train-core (= 3.10.1) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -606,7 +606,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.9.2) + train-core (3.10.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -642,7 +642,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.1.0) + unicode-display_width (2.2.0) unicode_utils (1.4.0) winrm (2.3.6) builder (>= 2.1.2) From a81ced482d266171888e4575775e256289c9e66c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 17 Jul 2022 19:48:06 +0100 Subject: [PATCH 7/9] chore(gemfile.lock): update to latest gem versions (2022-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/454 --- Gemfile.lock | 38 +++++++++++----------- bin/kitchen | 4 +-- test/integration/share/libraries/system.rb | 2 ++ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 15bc27b0..79083eba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,20 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: da3b324893676451fbe419cb11dff91372a9bb9e + revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c branch: ssf specs: - inspec (5.18.9) + inspec (5.18.15) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.18.9) + inspec-core (= 5.18.15) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake - train (~> 3.0) + train (~> 3.10) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.18.9) + inspec-core (5.18.15) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -34,7 +34,7 @@ GIT sslshake (~> 1.2) thor (>= 0.20, < 2.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.602.0) + aws-partitions (1.607.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -74,7 +74,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.54.0) + aws-sdk-athena (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -86,7 +86,7 @@ GEM aws-sdk-budgets (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.69.0) + aws-sdk-cloudformation (1.70.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.65.0) @@ -125,7 +125,7 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.77.0) + aws-sdk-configservice (1.79.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.131.2) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.320.0) + aws-sdk-ec2 (1.322.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -211,7 +211,7 @@ GEM aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.23.0) + aws-sdk-networkmanager (1.24.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -220,10 +220,10 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.146.0) + aws-sdk-rds (1.148.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.83.0) + aws-sdk-redshift (1.84.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.63.0) @@ -375,7 +375,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.6.1) @@ -402,7 +402,7 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.1) + minitest (5.16.2) mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) @@ -481,7 +481,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) + rubocop-ast (1.19.1) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -499,7 +499,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.3.0) + test-kitchen (3.3.1) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) diff --git a/bin/kitchen b/bin/kitchen index dcfdb4ca..5d5663e2 100755 --- a/bin/kitchen +++ b/bin/kitchen @@ -19,8 +19,8 @@ if File.file?(bundle_binstub) load(bundle_binstub) else abort( - 'Your `bin/bundle` was not generated by Bundler, '\ - 'so this binstub cannot run. Replace `bin/bundle` by running '\ + 'Your `bin/bundle` was not generated by Bundler, ' \ + 'so this binstub cannot run. Replace `bin/bundle` by running ' \ '`bundle binstubs bundler --force`, then run this command again.' ) end diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 0db9d0b1..64405bbc 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -97,6 +97,8 @@ def build_finger_release # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity def build_platform_codename case build_platform_finger + when 'ubuntu-22.04' + 'jammy' when 'ubuntu-20.04' 'focal' when 'ubuntu-18.04' From 2881fdd81136b1d57ae493dcb58b2b79947f6d0a Mon Sep 17 00:00:00 2001 From: Eric Cook Date: Thu, 14 Jul 2022 00:12:36 -0400 Subject: [PATCH 8/9] feat(freebsd): update package names for Python 3.9 % print $OSTYPE;pkg search 'py39-(pygit2|gitpython|dulwich|salt)' freebsd13.0 py39-dulwich-0.19.16 Python implementation of the Git file formats and protocols py39-gitpython-3.1.27 Python Git Library py39-pygit2-1.8.0 Python bindings for libgit2 py39-salt-3004.2 Distributed remote execution and configuration management system --- salt/osmap.yaml | 18 +++++++++--------- test/integration/default/controls/pkgs_spec.rb | 2 +- .../default/files/_mapdata/freebsd-12.yaml | 18 +++++++++--------- .../default/files/_mapdata/freebsd-13.yaml | 18 +++++++++--------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/salt/osmap.yaml b/salt/osmap.yaml index 642b2810..c5537282 100644 --- a/salt/osmap.yaml +++ b/salt/osmap.yaml @@ -66,15 +66,15 @@ MacOS: salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20 FreeBSD: - salt_master: py38-salt - salt_minion: py38-salt - salt_syndic: py38-salt - salt_cloud: py38-salt - salt_api: py38-salt - salt_ssh: py38-salt - python_git: py38-gitpython - pygit2: py38-pygit2 - python_dulwich: py38-dulwich + salt_master: py39-salt + salt_minion: py39-salt + salt_syndic: py39-salt + salt_cloud: py39-salt + salt_api: py39-salt + salt_ssh: py39-salt + python_git: py39-gitpython + pygit2: py39-pygit2 + python_dulwich: py39-dulwich # If `osfingermap.yaml` is introduced in the future, perhaps better to move to there, # since this is probably specific to `OpenBSD-6` diff --git a/test/integration/default/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb index 3bfb34b0..be8ddb61 100644 --- a/test/integration/default/controls/pkgs_spec.rb +++ b/test/integration/default/controls/pkgs_spec.rb @@ -5,7 +5,7 @@ when 'arch' %w[salt] when /bsd$/ - %w[py38-salt] + %w[py39-salt] when 'windows' ['Salt Minion'] when 'mac_os_x' diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml index 646dae79..c6aa88aa 100644 --- a/test/integration/default/files/_mapdata/freebsd-12.yaml +++ b/test/integration/default/files/_mapdata/freebsd-12.yaml @@ -88,9 +88,9 @@ values: pin_version: false pkgrepo: '' py_ver: py3 - pygit2: py38-pygit2 - python_dulwich: py38-dulwich - python_git: py38-gitpython + pygit2: py39-pygit2 + python_dulwich: py39-dulwich + python_git: py39-gitpython release: '3004' restart_via_at: false retry_options: @@ -100,14 +100,14 @@ values: until: true rootgroup: wheel rootuser: root - salt_api: py38-salt - salt_cloud: py38-salt - salt_master: py38-salt + salt_api: py39-salt + salt_cloud: py39-salt + salt_master: py39-salt salt_master_macos_plist_hash: '' - salt_minion: py38-salt + salt_minion: py39-salt salt_minion_macos_plist_hash: '' - salt_ssh: py38-salt - salt_syndic: py38-salt + salt_ssh: py39-salt + salt_syndic: py39-salt ssh_roster: {} syndic_service: salt_syndic use_pip: false diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml index 88360b66..ec8d7956 100644 --- a/test/integration/default/files/_mapdata/freebsd-13.yaml +++ b/test/integration/default/files/_mapdata/freebsd-13.yaml @@ -88,9 +88,9 @@ values: pin_version: false pkgrepo: '' py_ver: py3 - pygit2: py38-pygit2 - python_dulwich: py38-dulwich - python_git: py38-gitpython + pygit2: py39-pygit2 + python_dulwich: py39-dulwich + python_git: py39-gitpython release: '3004' restart_via_at: false retry_options: @@ -100,14 +100,14 @@ values: until: true rootgroup: wheel rootuser: root - salt_api: py38-salt - salt_cloud: py38-salt - salt_master: py38-salt + salt_api: py39-salt + salt_cloud: py39-salt + salt_master: py39-salt salt_master_macos_plist_hash: '' - salt_minion: py38-salt + salt_minion: py39-salt salt_minion_macos_plist_hash: '' - salt_ssh: py38-salt - salt_syndic: py38-salt + salt_ssh: py39-salt + salt_syndic: py39-salt ssh_roster: {} syndic_service: salt_syndic use_pip: false From cc6a3a204e21ff5a3a5ff6b5d8d3133ec093f393 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 26 Aug 2022 21:13:26 +0000 Subject: [PATCH 9/9] chore(release): 1.12.0 [skip ci] # [1.12.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.11.0...v1.12.0) (2022-08-26) ### Continuous Integration * update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([c8f9dd4](https://github.com/saltstack-formulas/salt-formula/commit/c8f9dd44e610b250dc85a1e1f9c5475866902b5c)) ### Features * **freebsd:** update package names for Python 3.9 ([2881fdd](https://github.com/saltstack-formulas/salt-formula/commit/2881fdd81136b1d57ae493dcb58b2b79947f6d0a)) --- AUTHORS.md | 10 +++++----- CHANGELOG.md | 12 ++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 20 ++++++++++---------- docs/CHANGELOG.rst | 15 +++++++++++++++ 5 files changed, 43 insertions(+), 16 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index a7a388a9..0da347c2 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|285 +@myii|[@myii](https://github.com/myii)|299 @aboe76|[@aboe76](https://github.com/aboe76)|102 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @@ -17,7 +17,7 @@ Avatar|Contributor|Contributions @dafyddj|[@dafyddj](https://github.com/dafyddj)|13 @whiteinge|[@whiteinge](https://github.com/whiteinge)|12 @rhertzog|[@rhertzog](https://github.com/rhertzog)|12 -@babilen|[@babilen](https://github.com/babilen)|8 +@wwentland|[@wwentland](https://github.com/wwentland)|8 @UtahDave|[@UtahDave](https://github.com/UtahDave)|8 @colin-stubbs|[@colin-stubbs](https://github.com/colin-stubbs)|7 @techhat|[@techhat](https://github.com/techhat)|7 @@ -37,7 +37,6 @@ Avatar|Contributor|Contributions @jcftang|[@jcftang](https://github.com/jcftang)|3 @johtso|[@johtso](https://github.com/johtso)|3 @kev009|[@kev009](https://github.com/kev009)|3 -@excavador|[@excavador](https://github.com/excavador)|3 @vquiering|[@vquiering](https://github.com/vquiering)|3 @ze42|[@ze42](https://github.com/ze42)|3 @smlloyd|[@smlloyd](https://github.com/smlloyd)|3 @@ -62,6 +61,7 @@ Avatar|Contributor|Contributions @tobias-m|[@tobias-m](https://github.com/tobias-m)|2 @ek9|[@ek9](https://github.com/ek9)|2 @hkbakke|[@hkbakke](https://github.com/hkbakke)|2 +@sticky-note|[@sticky-note](https://github.com/sticky-note)|2 @tiger-seo|[@tiger-seo](https://github.com/tiger-seo)|2 @major0|[@major0](https://github.com/major0)|2 @matthew-parlette|[@matthew-parlette](https://github.com/matthew-parlette)|2 @@ -76,6 +76,7 @@ Avatar|Contributor|Contributions @vutny|[@vutny](https://github.com/vutny)|1 @blast-hardcheese|[@blast-hardcheese](https://github.com/blast-hardcheese)|1 @mecavity|[@mecavity](https://github.com/mecavity)|1 +@llua|[@llua](https://github.com/llua)|1 @felix-russell|[@felix-russell](https://github.com/felix-russell)|1 @Furlot|[@Furlot](https://github.com/Furlot)|1 @iondulgheru|[@iondulgheru](https://github.com/iondulgheru)|1 @@ -109,9 +110,8 @@ Avatar|Contributor|Contributions @jpic|[@jpic](https://github.com/jpic)|1 @kabakaev|[@kabakaev](https://github.com/kabakaev)|1 @mechleg|[@mechleg](https://github.com/mechleg)|1 -@sticky-note|[@sticky-note](https://github.com/sticky-note)|1 @bersace|[@bersace](https://github.com/bersace)|1 --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-05-17. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-08-26. diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e764bb2..08872b66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +# [1.12.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.11.0...v1.12.0) (2022-08-26) + + +### Continuous Integration + +* update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([c8f9dd4](https://github.com/saltstack-formulas/salt-formula/commit/c8f9dd44e610b250dc85a1e1f9c5475866902b5c)) + + +### Features + +* **freebsd:** update package names for Python 3.9 ([2881fdd](https://github.com/saltstack-formulas/salt-formula/commit/2881fdd81136b1d57ae493dcb58b2b79947f6d0a)) + # [1.11.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.3...v1.11.0) (2022-05-17) diff --git a/FORMULA b/FORMULA index 6e8b67ce..7fa57290 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: salt os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows -version: 1.11.0 +version: 1.12.0 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 1c5048c9..2da4ed64 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 285 + - 299 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 102 @@ -52,8 +52,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@rhertzog` - `@rhertzog `_ - 12 - * - :raw-html-m2r:`@babilen` - - `@babilen `_ + * - :raw-html-m2r:`@wwentland` + - `@wwentland `_ - 8 * - :raw-html-m2r:`@UtahDave` - `@UtahDave `_ @@ -112,9 +112,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@kev009` - `@kev009 `_ - 3 - * - :raw-html-m2r:`@excavador` - - `@excavador `_ - - 3 * - :raw-html-m2r:`@vquiering` - `@vquiering `_ - 3 @@ -187,6 +184,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@hkbakke` - `@hkbakke `_ - 2 + * - :raw-html-m2r:`@sticky-note` + - `@sticky-note `_ + - 2 * - :raw-html-m2r:`@tiger-seo` - `@tiger-seo `_ - 2 @@ -229,6 +229,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@mecavity` - `@mecavity `_ - 1 + * - :raw-html-m2r:`@llua` + - `@llua `_ + - 1 * - :raw-html-m2r:`@felix-russell` - `@felix-russell `_ - 1 @@ -328,9 +331,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@mechleg` - `@mechleg `_ - 1 - * - :raw-html-m2r:`@sticky-note` - - `@sticky-note `_ - - 1 * - :raw-html-m2r:`@bersace` - `@bersace `_ - 1 @@ -338,4 +338,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-05-17. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-08-26. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 4f42e105..8ad6db5d 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`1.12.0 `_ (2022-08-26) +--------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* update ``pre-commit`` configuration inc. for pre-commit.ci [skip ci] (\ `c8f9dd4 `_\ ) + +Features +^^^^^^^^ + + +* **freebsd:** update package names for Python 3.9 (\ `2881fdd `_\ ) + `1.11.0 `_ (2022-05-17) ---------------------------------------------------------------------------------------------------------