diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdf0e14d588f153a59d8f131b82d5ea7a67ebf97..3830c1cdc39b39b957afc6c608205ef1abf1220b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,6 +150,7 @@ default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-7-master-py3: {extends: '.test_instance'}
+# 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'}
@@ -168,6 +169,7 @@ default-ubuntu-1804-master-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-35-3004-0-py3: {extends: '.test_instance'}
# default-fedora-34-3004-0-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'}
@@ -185,7 +187,7 @@ default-ubuntu-1804-master-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-35-3003-3-py3: {extends: '.test_instance'}
# 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'}
@@ -200,7 +202,7 @@ default-ubuntu-1804-master-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-35-3002-7-py3: {extends: '.test_instance'}
# 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'}
diff --git a/.travis.yml b/.travis.yml
index b95d31214c66b50861bed1408aa2c62ea83f0311..85ee1e78f8bfc3e52071e376e6f98d99fbe86a49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -102,6 +102,7 @@ jobs:
- env: INSTANCE=default-ubuntu-1804-master-py3
# - env: INSTANCE=default-centos-stream8-master-py3
# - env: INSTANCE=default-centos-7-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
@@ -120,6 +121,7 @@ jobs:
# - 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-35-3004-0-py3
# - env: INSTANCE=default-fedora-34-3004-0-py3
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a92ec629d2867deaf7f28863062535064a138b5..788512c2b6ff4de9f37125a61cbdd663d1267b2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
- revision: 8b29ba7ad69faeb103c345c560417c5374db8df3
+ revision: 36118e817641fbc1d4bd9753a77c383e7b20caff
branch: ssf
specs:
- inspec (5.8.0)
+ inspec (5.10.7)
cookstyle
faraday_middleware (>= 0.12.2, < 1.1)
- inspec-core (= 5.8.0)
+ inspec-core (= 5.10.7)
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.10.7)
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.568.0)
+ aws-partitions (1.571.0)
aws-sdk-alexaforbusiness (1.56.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
@@ -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.75.0)
+ aws-sdk-configservice (1.76.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.130.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.303.0)
+ aws-sdk-ec2 (1.304.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.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)
@@ -160,7 +160,7 @@ GEM
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.82.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-mq (1.40.0)
@@ -223,7 +223,7 @@ GEM
aws-sdk-rds (1.142.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)
@@ -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)
@@ -431,7 +431,7 @@ GEM
nori (2.6.0)
options (2.3.2)
os (1.1.4)
- parallel (1.22.0)
+ parallel (1.22.1)
parser (3.1.1.0)
ast (~> 2.4.1)
parslet (1.8.2)
diff --git a/kitchen.yml b/kitchen.yml
index c7fa06801cdfe246fd8e6fb1a6f8278ac1848165..9bc1af50b9cad430049e3c1784bb0a4b3599fd2d 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -89,6 +89,9 @@ platforms:
- name: centos-7-master-py3
driver:
image: saltimages/salt-master-py3:centos-7
+ - 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
@@ -159,6 +162,9 @@ platforms:
- name: centos-7-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:centos-7
+ - name: fedora-35-3004-0-py3
+ driver:
+ image: saltimages/salt-3004.0-py3:fedora-35
- name: fedora-34-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:fedora-34