Merge branch 'saltstack-formulas:master' into master

.gitlab-ci.yml

@@ -164,6 +164,10 @@ centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # passenger-centos-7-master-py3: {extends: '.test_instance'}
 centos-7-master-py3: {extends: '.test_instance'}
+default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
+# fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
+default-fedora-35-master-py3: {extends: '.test_instance'}
+# fedora-35-master-py3: {extends: '.test_instance'}
 default-fedora-34-master-py3: {extends: '.test_instance'}
 # fedora-34-master-py3: {extends: '.test_instance'}
 default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
@@ -189,54 +193,44 @@ almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # passenger-rockylinux-8-master-py3: {extends: '.test_instance'}
 rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-11-3004-0-py3: {extends: '.test_instance'}
-# default-debian-10-3004-0-py3: {extends: '.test_instance'}
-# default-debian-9-3004-0-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
-# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3004-0-py3: {extends: '.test_instance'}
-# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
+# default-debian-11-3004-1-py3: {extends: '.test_instance'}
+# default-debian-10-3004-1-py3: {extends: '.test_instance'}
+# default-debian-9-3004-1-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
+# 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'}
+# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
+# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
+# 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-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
-# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
-# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
-# default-debian-10-3003-3-py3: {extends: '.test_instance'}
-# default-debian-9-3003-3-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
-# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3003-3-py3: {extends: '.test_instance'}
-# default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
-# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
-# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
-# default-debian-10-3002-7-py3: {extends: '.test_instance'}
-# default-debian-9-3002-7-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
-# default-centos-7-3002-7-py3: {extends: '.test_instance'}
-# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
-# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
+# default-debian-10-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'}
+# default-centos-7-3003-4-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-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
 
 ###############################################################################

.travis.yml

@@ -116,6 +116,10 @@ jobs:
     # - env: INSTANCE=default-centos-7-master-py3
     # - env: INSTANCE=passenger-centos-7-master-py3
     - env: INSTANCE=centos-7-master-py3
+    - env: INSTANCE=default-fedora-36-master-py3
+    # - env: INSTANCE=fedora-36-master-py3
+    - env: INSTANCE=default-fedora-35-master-py3
+    # - env: INSTANCE=fedora-35-master-py3
     - env: INSTANCE=default-fedora-34-master-py3
     # - env: INSTANCE=fedora-34-master-py3
     - env: INSTANCE=default-opensuse-leap-153-master-py3
@@ -141,54 +145,44 @@ jobs:
     # - env: INSTANCE=default-rockylinux-8-master-py3
     # - env: INSTANCE=passenger-rockylinux-8-master-py3
     - env: INSTANCE=rockylinux-8-master-py3
-    # - env: INSTANCE=default-debian-11-3004-0-py3
-    # - env: INSTANCE=default-debian-10-3004-0-py3
-    # - env: INSTANCE=default-debian-9-3004-0-py3
-    # - env: INSTANCE=default-ubuntu-2004-3004-0-py3
-    # - env: INSTANCE=default-ubuntu-1804-3004-0-py3
-    # - env: INSTANCE=default-centos-stream8-3004-0-py3
-    # - env: INSTANCE=default-centos-7-3004-0-py3
-    # - env: INSTANCE=default-fedora-34-3004-0-py3
+    # - env: INSTANCE=default-debian-11-3004-1-py3
+    # - env: INSTANCE=default-debian-10-3004-1-py3
+    # - env: INSTANCE=default-debian-9-3004-1-py3
+    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
+    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
+    # - env: INSTANCE=default-centos-stream8-3004-1-py3
+    # - 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
+    # - env: INSTANCE=default-arch-base-latest-3004-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
+    # - env: INSTANCE=default-almalinux-8-3004-1-py3
+    # - env: INSTANCE=default-rockylinux-8-3004-1-py3
     # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=default-amazonlinux-2-3004-0-py3
-    # - env: INSTANCE=default-oraclelinux-8-3004-0-py3
-    # - env: INSTANCE=default-oraclelinux-7-3004-0-py3
-    # - env: INSTANCE=default-arch-base-latest-3004-0-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
-    # - env: INSTANCE=default-almalinux-8-3004-0-py3
-    # - env: INSTANCE=default-rockylinux-8-3004-0-py3
-    # - env: INSTANCE=default-debian-10-3003-3-py3
-    # - env: INSTANCE=default-debian-9-3003-3-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-3-py3
-    # - env: INSTANCE=default-ubuntu-1804-3003-3-py3
-    # - env: INSTANCE=default-centos-stream8-3003-3-py3
-    # - env: INSTANCE=default-centos-7-3003-3-py3
-    # - env: INSTANCE=default-fedora-35-3003-3-py3
-    # - env: INSTANCE=default-fedora-34-3003-3-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-3-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-3-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-3-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
-    # - env: INSTANCE=default-almalinux-8-3003-3-py3
-    # - env: INSTANCE=default-debian-10-3002-7-py3
-    # - env: INSTANCE=default-debian-9-3002-7-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-7-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-7-py3
-    # - env: INSTANCE=default-centos-7-3002-7-py3
-    # - env: INSTANCE=default-fedora-35-3002-7-py3
-    # - env: INSTANCE=default-fedora-34-3002-7-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-7-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-7-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-7-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
+    # - env: INSTANCE=default-debian-10-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
+    # - env: INSTANCE=default-centos-7-3003-4-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
+    # - 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'

Gemfile.lock

@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 8b29ba7ad69faeb103c345c560417c5374db8df3
+  revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b
   branch: ssf
   specs:
-    inspec (5.8.0)
+    inspec (5.12.2)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.8.0)
+      inspec-core (= 5.12.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.8.0)
+    inspec-core (5.12.2)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8
+  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
   branch: ssf
   specs:
     kitchen-docker (2.12.0)
@@ -58,14 +58,14 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.568.0)
+    aws-partitions (1.577.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.75.0)
+    aws-sdk-apigateway (1.76.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.52.0)
+    aws-sdk-athena (1.53.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-autoscaling (1.63.0)
@@ -101,7 +101,7 @@ GEM
     aws-sdk-cloudtrail (1.48.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.62.0)
+    aws-sdk-cloudwatch (1.64.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudwatchevents (1.46.0)
@@ -125,10 +125,10 @@ GEM
     aws-sdk-cognitoidentityprovider (1.53.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.75.0)
+    aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.130.0)
+    aws-sdk-core (3.130.1)
       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.303.0)
+    aws-sdk-ec2 (1.307.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -151,16 +151,16 @@ GEM
     aws-sdk-ecrpublic (1.12.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.98.0)
+    aws-sdk-ecs (1.99.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.53.0)
+    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-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.75.0)
+    aws-sdk-elasticache (1.76.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticbeanstalk (1.51.0)
@@ -202,7 +202,7 @@ GEM
     aws-sdk-kms (1.55.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.81.0)
+    aws-sdk-lambda (1.83.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-mq (1.40.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.142.0)
+    aws-sdk-rds (1.143.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.79.0)
+    aws-sdk-redshift (1.80.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53 (1.62.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.62.0)
+    aws-sdk-securityhub (1.63.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-servicecatalog (1.60.0)
@@ -263,7 +263,7 @@ GEM
     aws-sdk-simpledb (1.29.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv2 (~> 1.0)
-    aws-sdk-sms (1.39.0)
+    aws-sdk-sms (1.40.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-sns (1.53.0)
@@ -272,7 +272,7 @@ GEM
     aws-sdk-sqs (1.51.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.132.0)
+    aws-sdk-ssm (1.134.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-states (1.39.0)
@@ -328,7 +328,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.3.0)
     erubi (1.10.0)
-    excon (0.92.1)
+    excon (0.92.2)
     faraday (1.4.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -367,8 +367,9 @@ GEM
       signet (~> 0.14)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashie (4.1.0)
     highline (2.0.3)
     http-cookie (1.0.4)
@@ -409,7 +410,7 @@ GEM
       mixlib-versioning
       thor
     mixlib-log (3.0.9)
-    mixlib-shellout (3.2.5)
+    mixlib-shellout (3.2.7)
       chef-utils
     mixlib-versioning (1.2.12)
     mongo (2.13.2)
@@ -433,8 +434,8 @@ GEM
     nori (2.6.0)
     options (2.3.2)
     os (1.1.4)
-    parallel (1.22.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)
@@ -445,10 +446,10 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.3.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -467,7 +468,7 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
@@ -480,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.16.0)
+    rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -516,7 +517,7 @@ GEM
     timeliness (0.3.10)
     tomlrb (1.3.0)
     trailblazer-option (0.1.2)
-    train (3.8.9)
+    train (3.9.2)
       activesupport (>= 6.0.3.1)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
@@ -527,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.8.9)
+      train-core (= 3.9.2)
       train-winrm (~> 0.2)
     train-aws (0.2.24)
       aws-sdk-alexaforbusiness (~> 1.0)
@@ -605,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.8.9)
+    train-core (3.9.2)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)

kitchen.yml

@@ -89,6 +89,12 @@ platforms:
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
+  - name: fedora-36-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-36
+  - 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
@@ -132,36 +138,69 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3004.0`
-  - name: debian-11-3004-0-py3
+  ## SALT `3004.1`
+  - name: debian-11-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:debian-11
+      image: saltimages/salt-3004.1-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3004-0-py3
+  - name: debian-10-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:debian-10
+      image: saltimages/salt-3004.1-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3004-0-py3
+  - name: debian-9-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:debian-9
+      image: saltimages/salt-3004.1-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3004-0-py3
+  - name: ubuntu-2004-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:ubuntu-20.04
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3004-0-py3
+  - name: ubuntu-1804-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:ubuntu-18.04
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-stream8-3004-0-py3
+  - name: centos-stream8-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:centos-stream8
+  - name: centos-7-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:centos-7
+  - name: fedora-36-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:fedora-36
+  - 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
+  - name: oraclelinux-8-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:oraclelinux-8
+  - name: oraclelinux-7-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:oraclelinux-7
+  - name: arch-base-latest-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:centos-stream8
-  - name: centos-7-3004-0-py3
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:centos-7
-  - name: fedora-34-3004-0-py3
+      image: saltimages/salt-3004.1-py3:almalinux-8
+  - name: rockylinux-8-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:fedora-34
+      image: saltimages/salt-3004.1-py3:rockylinux-8
+
+  ## SALT `3004.0`
   - name: opensuse-leap-153-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
@@ -176,151 +215,72 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:amazonlinux-2
-  - name: oraclelinux-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:oraclelinux-8
-  - name: oraclelinux-7-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:oraclelinux-7
-  - name: arch-base-latest-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:almalinux-8
-  - name: rockylinux-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:rockylinux-8
 
-  ## SALT `3003.3`
-  - name: debian-10-3003-3-py3
+  ## SALT `3003.4`
+  - name: debian-10-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:debian-10
+      image: saltimages/salt-3003.4-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3003-3-py3
+  - name: debian-9-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:debian-9
+      image: saltimages/salt-3003.4-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-3-py3
+  - name: ubuntu-2004-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-20.04
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-3-py3
+  - name: ubuntu-1804-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-18.04
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-stream8-3003-3-py3
+  - name: centos-stream8-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:centos-stream8
-  - name: centos-7-3003-3-py3
+      image: saltimages/salt-3003.4-py3:centos-stream8
+  - name: centos-7-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:centos-7
-  - name: fedora-35-3003-3-py3
+      image: saltimages/salt-3003.4-py3:centos-7
+  - name: amazonlinux-2-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-35
-  - name: fedora-34-3003-3-py3
+      image: saltimages/salt-3003.4-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-34
-  - name: opensuse-leap-153-3003-3-py3
+      image: saltimages/salt-3003.4-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-3-py3
+      image: saltimages/salt-3003.4-py3:oraclelinux-7
+  - name: almalinux-8-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:almalinux-8
+      image: saltimages/salt-3003.4-py3:almalinux-8
 
-  ## SALT `3002.7`
-  - name: debian-10-3002-7-py3
+  ## SALT `3002.8`
+  - name: debian-10-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:debian-10
+      image: saltimages/salt-3002.8-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3002-7-py3
+  - name: debian-9-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:debian-9
+      image: saltimages/salt-3002.8-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-7-py3
+  - name: ubuntu-2004-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-20.04
+      image: saltimages/salt-3002.8-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-7-py3
+  - name: ubuntu-1804-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-18.04
+      image: saltimages/salt-3002.8-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-7-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:centos-7
-  - name: fedora-35-3002-7-py3
+  - name: centos-7-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:fedora-35
-  - name: fedora-34-3002-7-py3
+      image: saltimages/salt-3002.8-py3:centos-7
+  - name: amazonlinux-2-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:fedora-34
-  - name: opensuse-leap-153-3002-7-py3
+      image: saltimages/salt-3002.8-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3002-7-py3
+      image: saltimages/salt-3002.8-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3002.8-py3:oraclelinux-7
 
 verifier:
   # https://www.inspec.io/
@@ -374,30 +334,30 @@ suites:
       - oraclelinux-8-master-py3
       - almalinux-8-master-py3
       - rockylinux-8-master-py3
-      - debian-11-3004-0-py3
-      - debian-10-3004-0-py3
-      - debian-9-3004-0-py3
-      - ubuntu-2004-3004-0-py3
-      - ubuntu-1804-3004-0-py3
-      - centos-stream8-3004-0-py3
-      - centos-7-3004-0-py3
-      - oraclelinux-8-3004-0-py3
-      - almalinux-8-3004-0-py3
-      - rockylinux-8-3004-0-py3
-      - debian-10-3003-3-py3
-      - debian-9-3003-3-py3
-      - ubuntu-2004-3003-3-py3
-      - ubuntu-1804-3003-3-py3
-      - centos-stream8-3003-3-py3
-      - centos-7-3003-3-py3
-      - oraclelinux-8-3003-3-py3
-      - almalinux-8-3003-3-py3
-      - debian-10-3002-7-py3
-      - debian-9-3002-7-py3
-      - ubuntu-2004-3002-7-py3
-      - ubuntu-1804-3002-7-py3
-      - centos-7-3002-7-py3
-      - oraclelinux-8-3002-7-py3
+      - debian-11-3004-1-py3
+      - debian-10-3004-1-py3
+      - debian-9-3004-1-py3
+      - ubuntu-2004-3004-1-py3
+      - ubuntu-1804-3004-1-py3
+      - centos-stream8-3004-1-py3
+      - centos-7-3004-1-py3
+      - oraclelinux-8-3004-1-py3
+      - almalinux-8-3004-1-py3
+      - rockylinux-8-3004-1-py3
+      - debian-10-3003-4-py3
+      - debian-9-3003-4-py3
+      - ubuntu-2004-3003-4-py3
+      - ubuntu-1804-3003-4-py3
+      - centos-stream8-3003-4-py3
+      - centos-7-3003-4-py3
+      - oraclelinux-8-3003-4-py3
+      - almalinux-8-3003-4-py3
+      - debian-10-3002-8-py3
+      - debian-9-3002-8-py3
+      - ubuntu-2004-3002-8-py3
+      - ubuntu-1804-3002-8-py3
+      - centos-7-3002-8-py3
+      - oraclelinux-8-3002-8-py3
     provisioner:
       state_top:
         base: