diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c37c38..afbe8fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,6 +134,7 @@ rubocop: # default-debian-11-tiamat-py3: {extends: '.test_instance'} # default-debian-10-tiamat-py3: {extends: '.test_instance'} # default-debian-9-tiamat-py3: {extends: '.test_instance'} +# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} # default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} @@ -146,6 +147,7 @@ rubocop: # default-debian-11-master-py3: {extends: '.test_instance'} # default-debian-10-master-py3: {extends: '.test_instance'} # default-debian-9-master-py3: {extends: '.test_instance'} +# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} # 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'} @@ -166,6 +168,7 @@ rubocop: 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-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'} 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'} diff --git a/.travis.yml b/.travis.yml index 97aa997..d1824fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,7 @@ jobs: # - env: INSTANCE=default-debian-11-tiamat-py3 # - env: INSTANCE=default-debian-10-tiamat-py3 # - env: INSTANCE=default-debian-9-tiamat-py3 + # - env: INSTANCE=default-ubuntu-2204-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 # - env: INSTANCE=default-centos-stream8-tiamat-py3 @@ -98,6 +99,7 @@ jobs: # - env: INSTANCE=default-debian-11-master-py3 # - env: INSTANCE=default-debian-10-master-py3 # - env: INSTANCE=default-debian-9-master-py3 + # - env: INSTANCE=default-ubuntu-2204-master-py3 # - env: INSTANCE=default-ubuntu-2004-master-py3 # - env: INSTANCE=default-ubuntu-1804-master-py3 # - env: INSTANCE=default-centos-stream8-master-py3 @@ -118,6 +120,7 @@ jobs: - 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-2204-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 diff --git a/Gemfile.lock b/Gemfile.lock index 3718f0f..229881d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 90eafd68e8ca3d7444c4a83c5c2e38e32285410c + revision: bb1df209366a8054faff1d85bd2566b5f97b339e branch: ssf specs: - inspec (5.14.0) + inspec (5.14.5) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.14.0) + inspec-core (= 5.14.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.14.0) + inspec-core (5.14.5) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.2.4) 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.579.0) + aws-partitions (1.584.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -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.63.0) + aws-sdk-cloudfront (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.39.0) @@ -98,7 +98,7 @@ GEM aws-sdk-cloudhsmv2 (1.42.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.48.0) + aws-sdk-cloudtrail (1.49.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatch (1.64.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.308.0) + aws-sdk-ec2 (1.310.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -187,7 +187,7 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.56.0) + aws-sdk-guardduty (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -208,7 +208,7 @@ GEM aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.15.0) + aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-networkmanager (1.22.0) @@ -220,7 +220,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.144.0) + aws-sdk-rds (1.145.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.81.0) @@ -235,7 +235,7 @@ GEM aws-sdk-route53resolver (1.37.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) + aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -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.63.0) + aws-sdk-securityhub (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -269,10 +269,10 @@ GEM aws-sdk-sns (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.51.0) + aws-sdk-sqs (1.51.1) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.135.0) + aws-sdk-ssm (1.137.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.2) + excon (0.92.3) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) diff --git a/kitchen.yml b/kitchen.yml index d9acca0..3801d36 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -43,6 +43,13 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: ubuntu-2204-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: ubuntu-2004-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-20.04 @@ -122,6 +129,13 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: ubuntu-2204-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: ubuntu-2004-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-20.04 @@ -258,6 +272,13 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: ubuntu-2204-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: ubuntu-2004-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:ubuntu-20.04