fix(module): include php version in redis module package name

set the php version in the map for debian module redis to allow installation of the desired version
This commit is contained in:
arend 2021-07-27 10:35:30 +02:00 committed by ahummeling
parent e59d88e705
commit 55939d5cd1
12 changed files with 329 additions and 278 deletions

View File

@ -152,21 +152,22 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
redhat-almalinux-8-master-py3: {extends: '.test_instance'}
redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
# debian-debian-11-3003-1-py3: {extends: '.test_instance'}
# debian-debian-10-3003-1-py3: {extends: '.test_instance'}
# debian-debian-9-3003-1-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
# redhat-centos-8-3003-1-py3: {extends: '.test_instance'}
# redhat-centos-7-3003-1-py3: {extends: '.test_instance'}
# redhat-fedora-34-3003-1-py3: {extends: '.test_instance'}
# redhat-fedora-33-3003-1-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
# debian-debian-11-3003-2-py3: {extends: '.test_instance'}
# debian-debian-10-3003-2-py3: {extends: '.test_instance'}
# debian-debian-9-3003-2-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
# redhat-centos-8-3003-2-py3: {extends: '.test_instance'}
# redhat-centos-7-3003-2-py3: {extends: '.test_instance'}
# redhat-fedora-34-3003-2-py3: {extends: '.test_instance'}
# redhat-fedora-33-3003-2-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
# redhat-almalinux-8-3003-2-py3: {extends: '.test_instance'}
# debian-debian-11-3002-6-py3: {extends: '.test_instance'}
# debian-debian-10-3002-6-py3: {extends: '.test_instance'}
# debian-debian-9-3002-6-py3: {extends: '.test_instance'}

View File

@ -112,21 +112,22 @@ jobs:
- env: INSTANCE=redhat-oraclelinux-7-master-py3
- env: INSTANCE=redhat-almalinux-8-master-py3
- env: INSTANCE=redhat-rockylinux-8-master-py3
# - env: INSTANCE=debian-debian-11-3003-1-py3
# - env: INSTANCE=debian-debian-10-3003-1-py3
# - env: INSTANCE=debian-debian-9-3003-1-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-1-py3
# - env: INSTANCE=redhat-centos-8-3003-1-py3
# - env: INSTANCE=redhat-centos-7-3003-1-py3
# - env: INSTANCE=redhat-fedora-34-3003-1-py3
# - env: INSTANCE=redhat-fedora-33-3003-1-py3
# - env: INSTANCE=suse-opensuse-leap-153-3003-1-py3
# - env: INSTANCE=suse-opensuse-leap-152-3003-1-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-1-py3
# - env: INSTANCE=redhat-amazonlinux-2-3003-1-py3
# - env: INSTANCE=redhat-oraclelinux-8-3003-1-py3
# - env: INSTANCE=redhat-oraclelinux-7-3003-1-py3
# - env: INSTANCE=debian-debian-11-3003-2-py3
# - env: INSTANCE=debian-debian-10-3003-2-py3
# - env: INSTANCE=debian-debian-9-3003-2-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-2-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-2-py3
# - env: INSTANCE=redhat-centos-8-3003-2-py3
# - env: INSTANCE=redhat-centos-7-3003-2-py3
# - env: INSTANCE=redhat-fedora-34-3003-2-py3
# - env: INSTANCE=redhat-fedora-33-3003-2-py3
# - env: INSTANCE=suse-opensuse-leap-153-3003-2-py3
# - env: INSTANCE=suse-opensuse-leap-152-3003-2-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-2-py3
# - env: INSTANCE=redhat-amazonlinux-2-3003-2-py3
# - env: INSTANCE=redhat-oraclelinux-8-3003-2-py3
# - env: INSTANCE=redhat-oraclelinux-7-3003-2-py3
# - env: INSTANCE=redhat-almalinux-8-3003-2-py3
# - env: INSTANCE=debian-debian-11-3002-6-py3
# - env: INSTANCE=debian-debian-10-3002-6-py3
# - env: INSTANCE=debian-debian-9-3002-6-py3

15
Gemfile
View File

@ -2,14 +2,19 @@
source 'https://rubygems.org'
# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
# regression where the diff isn't displayed when comparing using `eq`.
gem 'inspec', '~> 4.22.22'
# Install the `kitchen-docker` gem using `git` because the latest version
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
# Install the `inspec` gem using `git` because versions after `4.22.22`
# suppress diff output; this version fixes this for our uses.
# rubocop:disable Layout/LineLength
gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
# rubocop:enable Layout/LineLength
# Install the `kitchen-docker` gem using `git` in order to gain a performance
# improvement: avoid package installations which are already covered by the
# `salt-image-builder` (i.e. the pre-salted images that we're using)
# rubocop:disable Layout/LineLength
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
# rubocop:enable Layout/LineLength
gem 'kitchen-inspec', '>= 2.5.0'
gem 'kitchen-salt', '>= 0.6.3'

View File

@ -1,15 +1,52 @@
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
revision: 1f543f654da5c1774cb8737f6f07a01745520bb5
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
revision: 9a3c06719f3a209f34212151883fda40787a1626
branch: ssf
specs:
kitchen-docker (2.10.0)
inspec (4.46.4)
faraday_middleware (>= 0.12.2, < 1.1)
inspec-core (= 4.46.4)
mongo (= 2.13.2)
train (~> 3.0)
train-aws (~> 0.2)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
inspec-core (4.46.4)
addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5)
faraday_middleware (~> 1.0)
hashie (>= 3.4, < 5.0)
license-acceptance (>= 0.2.13, < 3.0)
method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
parallel (~> 1.9)
parslet (>= 1.5, < 2.0)
pry (~> 0.13)
rspec (>= 3.9, < 3.11)
rspec-its (~> 1.2)
rubyzip (>= 1.2.2, < 3.0)
semverse (~> 3.0)
sslshake (~> 1.2)
thor (>= 0.20, < 2.0)
tomlrb (>= 1.2, < 2.1)
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c
branch: ssf
specs:
kitchen-docker (2.11.0)
test-kitchen (>= 1.0.0)
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.4)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -17,204 +54,219 @@ GEM
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
aws-eventstream (1.1.1)
aws-partitions (1.479.0)
aws-sdk-apigateway (1.62.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-eventstream (1.2.0)
aws-partitions (1.501.0)
aws-sdk-alexaforbusiness (1.50.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-apigatewayv2 (1.32.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-amplify (1.32.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-apigateway (1.67.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-apigatewayv2 (1.36.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-applicationautoscaling (1.51.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-athena (1.37.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-athena (1.41.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-autoscaling (1.61.0)
aws-sdk-autoscaling (1.63.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-batch (1.47.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-budgets (1.38.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-budgets (1.41.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudformation (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-cloudformation (1.58.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudfront (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-cloudfront (1.56.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudhsm (1.30.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-cloudhsm (1.33.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudhsmv2 (1.33.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-cloudhsmv2 (1.36.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudtrail (1.35.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-cloudtrail (1.38.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudwatch (1.51.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-cloudwatch (1.55.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudwatchevents (1.46.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudwatchlogs (1.41.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-cloudwatchlogs (1.45.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-codecommit (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-codecommit (1.45.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-codedeploy (1.40.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-codedeploy (1.43.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-codepipeline (1.44.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-codepipeline (1.47.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-cognitoidentity (1.31.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-cognitoidentityprovider (1.51.0)
aws-sdk-cognitoidentityprovider (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-configservice (1.62.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-configservice (1.66.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.117.0)
aws-sdk-core (3.121.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-costandusagereportservice (1.31.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-costandusagereportservice (1.34.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-databasemigrationservice (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-dynamodb (1.60.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-dynamodb (1.63.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-ec2 (1.251.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-ec2 (1.262.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-ecr (1.46.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecrpublic (1.3.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-ecrpublic (1.6.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecs (1.81.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-ecs (1.85.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-efs (1.40.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-efs (1.44.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-eks (1.58.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-eks (1.63.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticache (1.57.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-elasticache (1.62.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticbeanstalk (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-elasticbeanstalk (1.45.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticloadbalancing (1.31.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-elasticloadbalancing (1.34.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticloadbalancingv2 (1.64.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-elasticloadbalancingv2 (1.67.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticsearchservice (1.52.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-elasticsearchservice (1.55.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-eventbridge (1.24.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-firehose (1.37.0)
aws-sdk-firehose (1.41.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-glue (1.88.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-glue (1.87.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-guardduty (1.48.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-guardduty (1.45.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-iam (1.60.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.57.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kafka (1.40.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-kafka (1.36.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kinesis (1.35.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.32.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (1.48.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.44.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-lambda (1.68.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-lambda (1.64.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-mq (1.40.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-networkfirewall (1.7.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-networkmanager (1.14.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.59.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-ram (1.25.0)
aws-sdk-ram (1.26.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-rds (1.122.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-rds (1.127.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-redshift (1.65.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-redshift (1.69.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-route53 (1.49.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-route53 (1.55.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-route53domains (1.30.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-route53domains (1.33.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-route53resolver (1.26.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-route53resolver (1.30.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.96.2)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-s3 (1.102.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (~> 1.4)
aws-sdk-secretsmanager (1.46.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-securityhub (1.48.0)
aws-sdk-securityhub (1.52.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-servicecatalog (1.60.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-servicecatalog (1.59.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-ses (1.41.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-ses (1.38.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-shield (1.41.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-shield (1.37.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-sms (1.32.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-sms (1.29.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-sns (1.45.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-sns (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-sqs (1.44.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-sqs (1.40.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-ssm (1.112.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-ssm (1.117.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-states (1.39.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-transfer (1.32.0)
aws-sdk-transfer (1.34.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.4)
aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
azure_graph_rbac (0.17.2)
ms_rest_azure (~> 0.12.0)
@ -227,18 +279,19 @@ GEM
azure_mgmt_storage (0.23.0)
ms_rest_azure (~> 0.12.0)
bcrypt_pbkdf (1.1.0)
bson (4.12.1)
builder (3.2.4)
chef-config (17.3.48)
chef-config (17.4.38)
addressable
chef-utils (= 17.3.48)
chef-utils (= 17.4.38)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-telemetry (1.0.29)
chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
chef-utils (17.3.48)
chef-utils (17.4.38)
concurrent-ruby
coderay (1.1.3)
concurrent-ruby (1.1.9)
@ -249,19 +302,28 @@ GEM
multi_json
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ed25519 (1.2.4)
erubi (1.10.0)
excon (0.85.0)
faraday (0.17.4)
faraday (1.4.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.15.3)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.15.4)
fuzzyurl (0.9.0)
google-api-client (0.52.0)
addressable (~> 2.5, >= 2.5.1)
@ -283,51 +345,15 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hana (1.3.7)
hashie (3.6.0)
hashie (4.1.0)
http-cookie (1.0.4)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
inifile (3.0.0)
inspec (4.22.22)
faraday_middleware (~> 0.12.2)
inspec-core (= 4.22.22)
train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
inspec-core (4.22.22)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
hashie (~> 3.4)
json_schemer (>= 0.2.1, < 0.2.12)
license-acceptance (>= 0.2.13, < 2.0)
method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0.13)
rspec (~> 3.9)
rspec-its (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2)
semverse (~> 3.0)
sslshake (~> 1.2)
thor (>= 0.20, < 2.0)
tomlrb (~> 1.2.0)
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
jmespath (1.4.0)
json (2.5.1)
json_schemer (0.2.11)
ecma-re-validator (~> 0.2)
hana (~> 1.3)
regexp_parser (~> 1.5)
uri_template (~> 0.7)
jwt (2.2.3)
kitchen-inspec (2.5.0)
hashie (>= 3.4, <= 5.0)
@ -336,24 +362,24 @@ GEM
kitchen-salt (0.6.3)
hashie (>= 3.5)
test-kitchen (>= 1.4)
kitchen-vagrant (1.9.0)
kitchen-vagrant (1.10.0)
test-kitchen (>= 1.4, < 4)
license-acceptance (1.0.19)
license-acceptance (2.1.13)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
tty-prompt (~> 0.18)
tomlrb (>= 1.2, < 3.0)
tty-box (~> 0.6)
tty-prompt (~> 0.20)
little-plugger (1.1.4)
logging (2.3.0)
little-plugger (~> 1.1)
multi_json (~> 1.14)
memoist (0.16.2)
method_source (1.0.0)
mini_mime (1.1.0)
mini_mime (1.1.1)
minitest (5.14.4)
mixlib-config (3.0.9)
tomlrb
mixlib-install (3.12.11)
mixlib-install (3.12.16)
mixlib-shellout
mixlib-versioning
thor
@ -361,6 +387,8 @@ GEM
mixlib-shellout (3.2.5)
chef-utils
mixlib-versioning (1.2.12)
mongo (2.13.2)
bson (>= 4.8.2, < 5.0.0)
ms_rest (0.7.6)
concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0)
@ -379,7 +407,7 @@ GEM
net-ssh (>= 4.0.0)
nori (2.6.0)
os (1.1.1)
parallel (1.20.1)
parallel (1.21.0)
parslet (1.8.2)
pastel (0.8.0)
tty-color (~> 0.5)
@ -387,7 +415,6 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
regexp_parser (1.8.2)
representable (3.1.1)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
@ -410,11 +437,12 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
rubyzip (1.3.0)
rubyzip (2.3.2)
semverse (3.0.0)
signet (0.15.0)
addressable (~> 2.3)
signet (0.16.0)
addressable (~> 2.8)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
@ -440,9 +468,9 @@ GEM
winrm-fs (~> 1.1)
thor (1.1.0)
timeliness (0.3.10)
tomlrb (1.2.9)
tomlrb (1.3.0)
trailblazer-option (0.1.1)
train (3.7.4)
train (3.8.1)
activesupport (>= 6.0.3.1)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
@ -453,14 +481,16 @@ GEM
google-api-client (>= 0.23.9, <= 0.52.0)
googleauth (>= 0.6.6, <= 0.14.0)
inifile (~> 3.0)
train-core (= 3.7.4)
train-core (= 3.8.1)
train-winrm (~> 0.2)
train-aws (0.2.8)
train-aws (0.2.19)
aws-sdk-alexaforbusiness (~> 1.0)
aws-sdk-amplify (~> 1.0)
aws-sdk-apigateway (~> 1.0)
aws-sdk-apigatewayv2 (~> 1.0)
aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
aws-sdk-athena (~> 1.0)
aws-sdk-autoscaling (>= 1.22, < 1.62)
aws-sdk-autoscaling (>= 1.22, < 1.64)
aws-sdk-batch (>= 1.36, < 1.48)
aws-sdk-budgets (~> 1.0)
aws-sdk-cloudformation (~> 1.0)
@ -475,7 +505,7 @@ GEM
aws-sdk-codedeploy (~> 1.0)
aws-sdk-codepipeline (~> 1.0)
aws-sdk-cognitoidentity (>= 1.26, < 1.32)
aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52)
aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54)
aws-sdk-configservice (~> 1.21)
aws-sdk-core (~> 3.0)
aws-sdk-costandusagereportservice (~> 1.6)
@ -494,15 +524,18 @@ GEM
aws-sdk-elasticsearchservice (~> 1.0)
aws-sdk-eventbridge (~> 1.24.0)
aws-sdk-firehose (~> 1.0)
aws-sdk-glue (>= 1.71, < 1.88)
aws-sdk-glue (>= 1.71, < 1.89)
aws-sdk-guardduty (~> 1.31)
aws-sdk-iam (~> 1.13)
aws-sdk-kafka (~> 1.0)
aws-sdk-kinesis (~> 1.0)
aws-sdk-kms (~> 1.13)
aws-sdk-lambda (~> 1.0)
aws-sdk-mq (~> 1.0)
aws-sdk-networkfirewall (>= 1.6.0)
aws-sdk-networkmanager (>= 1.13.0)
aws-sdk-organizations (>= 1.17, < 1.60)
aws-sdk-ram (>= 1.21, < 1.26)
aws-sdk-ram (>= 1.21, < 1.27)
aws-sdk-rds (~> 1.43)
aws-sdk-redshift (~> 1.0)
aws-sdk-route53 (~> 1.0)
@ -511,7 +544,7 @@ GEM
aws-sdk-s3 (~> 1.30)
aws-sdk-secretsmanager (>= 1.42, < 1.47)
aws-sdk-securityhub (~> 1.0)
aws-sdk-servicecatalog (>= 1.48, < 1.60)
aws-sdk-servicecatalog (>= 1.48, < 1.61)
aws-sdk-ses (~> 1.0)
aws-sdk-shield (~> 1.30)
aws-sdk-sms (~> 1.0)
@ -519,8 +552,8 @@ GEM
aws-sdk-sqs (~> 1.10)
aws-sdk-ssm (~> 1.0)
aws-sdk-states (>= 1.35, < 1.40)
aws-sdk-transfer (>= 1.26, < 1.33)
train-core (3.7.4)
aws-sdk-transfer (>= 1.26, < 1.35)
train-core (3.8.1)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
@ -558,7 +591,6 @@ GEM
unf_ext (0.0.7.7)
unicode-display_width (2.0.0)
unicode_utils (1.4.0)
uri_template (0.7.0)
winrm (2.3.6)
builder (>= 2.1.2)
erubi (~> 1.8)
@ -572,10 +604,10 @@ GEM
erubi (~> 1.8)
winrm (~> 2.0)
winrm-fs (~> 1.0)
winrm-fs (1.3.3)
winrm-fs (1.3.5)
erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
rubyzip (~> 2.0)
winrm (~> 2.0)
wisper (2.0.1)
zeitwerk (2.4.2)
@ -584,7 +616,7 @@ PLATFORMS
ruby
DEPENDENCIES
inspec (~> 4.22.22)
inspec!
kitchen-docker!
kitchen-inspec (>= 2.5.0)
kitchen-salt (>= 0.6.3)

View File

@ -142,69 +142,84 @@ platforms:
driver:
image: saltimages/salt-master-py3:rockylinux-8
## SALT `3003.1`
- name: debian-11-3003-1-py3
## SALT `3003.2`
- name: debian-11-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:debian-11
image: saltimages/salt-3003.2-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3003-1-py3
- name: debian-10-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:debian-10
image: saltimages/salt-3003.2-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3003-1-py3
- name: debian-9-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:debian-9
image: saltimages/salt-3003.2-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3003-1-py3
- name: ubuntu-2004-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:ubuntu-20.04
image: saltimages/salt-3003.2-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3003-1-py3
- name: ubuntu-1804-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:ubuntu-18.04
image: saltimages/salt-3003.2-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-8-3003-1-py3
- name: centos-8-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:centos-8
- name: centos-7-3003-1-py3
image: saltimages/salt-3003.2-py3:centos-8
- name: centos-7-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:centos-7
- name: fedora-34-3003-1-py3
image: saltimages/salt-3003.2-py3:centos-7
- name: fedora-34-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:fedora-34
- name: fedora-33-3003-1-py3
image: saltimages/salt-3003.2-py3:fedora-34
- name: fedora-33-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:fedora-33
- name: opensuse-leap-153-3003-1-py3
image: saltimages/salt-3003.2-py3:fedora-33
- name: opensuse-leap-153-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
image: saltimages/salt-3003.2-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-leap-152-3003-1-py3
- name: opensuse-leap-152-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-tmbl-latest-3003-1-py3
- name: opensuse-tmbl-latest-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3003.2-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-1-py3
- name: amazonlinux-2-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:amazonlinux-2
- name: oraclelinux-8-3003-1-py3
image: saltimages/salt-3003.2-py3:amazonlinux-2
- name: oraclelinux-8-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:oraclelinux-8
- name: oraclelinux-7-3003-1-py3
image: saltimages/salt-3003.2-py3:oraclelinux-8
- name: oraclelinux-7-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:oraclelinux-7
image: saltimages/salt-3003.2-py3:oraclelinux-7
- name: arch-base-latest-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:arch-base-latest
- name: gentoo-stage3-latest-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
- name: almalinux-8-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:almalinux-8
## SALT `3003.1`
- name: arch-base-latest-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:arch-base-latest
@ -436,9 +451,9 @@ suites:
- debian-11-master-py3
- debian-10-master-py3
- debian-9-master-py3
- debian-11-3003-1-py3
- debian-10-3003-1-py3
- debian-9-3003-1-py3
- debian-11-3003-2-py3
- debian-10-3003-2-py3
- debian-9-3003-2-py3
- debian-11-3002-6-py3
- debian-10-3002-6-py3
- debian-9-3002-6-py3
@ -473,8 +488,8 @@ suites:
- ubuntu-1804-tiamat-py3
- ubuntu-2004-master-py3
- ubuntu-1804-master-py3
- ubuntu-2004-3003-1-py3
- ubuntu-1804-3003-1-py3
- ubuntu-2004-3003-2-py3
- ubuntu-1804-3003-2-py3
- ubuntu-2004-3002-6-py3
- ubuntu-1804-3002-6-py3
- ubuntu-2004-3001-7-py3
@ -522,13 +537,14 @@ suites:
- oraclelinux-7-master-py3
- almalinux-8-master-py3
- rockylinux-8-master-py3
- centos-8-3003-1-py3
- centos-7-3003-1-py3
- fedora-34-3003-1-py3
- fedora-33-3003-1-py3
- amazonlinux-2-3003-1-py3
- oraclelinux-8-3003-1-py3
- oraclelinux-7-3003-1-py3
- centos-8-3003-2-py3
- centos-7-3003-2-py3
- fedora-34-3003-2-py3
- fedora-33-3003-2-py3
- amazonlinux-2-3003-2-py3
- oraclelinux-8-3003-2-py3
- oraclelinux-7-3003-2-py3
- almalinux-8-3003-2-py3
- centos-8-3002-6-py3
- centos-7-3002-6-py3
- fedora-34-3002-6-py3
@ -569,9 +585,9 @@ suites:
- opensuse-leap-153-master-py3
- opensuse-leap-152-master-py3
- opensuse-tmbl-latest-master-py3
- opensuse-leap-153-3003-1-py3
- opensuse-leap-152-3003-1-py3
- opensuse-tmbl-latest-3003-1-py3
- opensuse-leap-153-3003-2-py3
- opensuse-leap-152-3003-2-py3
- opensuse-tmbl-latest-3003-2-py3
- opensuse-leap-153-3002-2-py3
- opensuse-leap-152-3002-2-py3
- opensuse-tmbl-latest-3002-2-py3

View File

@ -2387,7 +2387,7 @@
'phpenmod_command': 'phpenmod -v' + php_version,
'pspell': 'php' + php_version + '-pspell',
'readline': 'php' + php_version + '-readline',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php' + php_version + '-snmp',
'soap': 'php' + php_version + '-soap',

View File

@ -9,17 +9,13 @@ control 'Php package' do
it { should be_installed }
end
describe package('php-redis') do
it { should be_installed }
end
describe package('php-xdebug') do
it { should be_installed }
end
%w[
bz2 cli curl fpm gd imap intl mbstring
mysql readline xml zip
mysql redis readline xml zip
].each do |pkg|
describe package("php5.6-#{pkg}") do
it { should be_installed }

View File

@ -344,7 +344,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

View File

@ -344,7 +344,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

View File

@ -344,7 +344,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

View File

@ -342,7 +342,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

View File

@ -342,7 +342,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib