Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • salt/php-formula
1 result
Select Git revision
Show changes
Commits on Source (32)
Show whitespace changes
Inline Side-by-side
Showing
with 1328 additions and 348 deletions
.gitlab-ci.yml
View file @ 6bb15478
......@@ -134,6 +134,7 @@ rubocop:
# debian-debian-11-tiamat-py3: {extends: '.test_instance'}
# debian-debian-10-tiamat-py3: {extends: '.test_instance'}
# debian-debian-9-tiamat-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# redhat-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
......@@ -146,11 +147,13 @@ rubocop:
debian-debian-11-master-py3: {extends: '.test_instance'}
debian-debian-10-master-py3: {extends: '.test_instance'}
debian-debian-9-master-py3: {extends: '.test_instance'}
ubuntu-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
redhat-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
redhat-centos-7-master-py3: {extends: '.test_instance'}
redhat-fedora-34-master-py3: {extends: '.test_instance'}
redhat-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
redhat-fedora-35-master-py3: {extends: '.test_instance'}
suse-opensuse-leap-153-master-py3: {extends: '.test_instance'}
suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
......@@ -158,47 +161,33 @@ 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-3004-0-py3: {extends: '.test_instance'}
# debian-debian-10-3004-0-py3: {extends: '.test_instance'}
# debian-debian-9-3004-0-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
# redhat-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
# redhat-centos-7-3004-0-py3: {extends: '.test_instance'}
# redhat-fedora-34-3004-0-py3: {extends: '.test_instance'}
# debian-debian-11-3004-1-py3: {extends: '.test_instance'}
# debian-debian-10-3004-1-py3: {extends: '.test_instance'}
# debian-debian-9-3004-1-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# ubuntu-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
# redhat-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# redhat-centos-7-3004-1-py3: {extends: '.test_instance'}
# redhat-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# redhat-fedora-35-3004-1-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
# redhat-almalinux-8-3004-1-py3: {extends: '.test_instance'}
# redhat-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
# redhat-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
# redhat-almalinux-8-3004-0-py3: {extends: '.test_instance'}
# redhat-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
# debian-debian-10-3003-3-py3: {extends: '.test_instance'}
# debian-debian-9-3003-3-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
# redhat-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# redhat-centos-7-3003-3-py3: {extends: '.test_instance'}
# redhat-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# redhat-fedora-34-3003-3-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# redhat-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
# redhat-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# debian-debian-10-3002-7-py3: {extends: '.test_instance'}
# debian-debian-9-3002-7-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# redhat-centos-7-3002-7-py3: {extends: '.test_instance'}
# redhat-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
# redhat-fedora-34-3002-7-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
# redhat-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# debian-debian-10-3003-4-py3: {extends: '.test_instance'}
# debian-debian-9-3003-4-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
# redhat-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
# redhat-centos-7-3003-4-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
# redhat-almalinux-8-3003-4-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length
###############################################################################
......
.pre-commit-config.yaml
View file @ 6bb15478
......@@ -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
......
.travis.yml
View file @ 6bb15478
......@@ -86,6 +86,7 @@ jobs:
# - env: INSTANCE=debian-debian-11-tiamat-py3
# - env: INSTANCE=debian-debian-10-tiamat-py3
# - env: INSTANCE=debian-debian-9-tiamat-py3
# - env: INSTANCE=ubuntu-ubuntu-2204-tiamat-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
# - env: INSTANCE=redhat-centos-stream8-tiamat-py3
......@@ -98,11 +99,13 @@ jobs:
- env: INSTANCE=debian-debian-11-master-py3
- env: INSTANCE=debian-debian-10-master-py3
- env: INSTANCE=debian-debian-9-master-py3
- env: INSTANCE=ubuntu-ubuntu-2204-master-py3
- env: INSTANCE=ubuntu-ubuntu-2004-master-py3
- env: INSTANCE=ubuntu-ubuntu-1804-master-py3
- env: INSTANCE=redhat-centos-stream8-master-py3
- env: INSTANCE=redhat-centos-7-master-py3
- env: INSTANCE=redhat-fedora-34-master-py3
- env: INSTANCE=redhat-fedora-36-master-py3
- env: INSTANCE=redhat-fedora-35-master-py3
- env: INSTANCE=suse-opensuse-leap-153-master-py3
- env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
- env: INSTANCE=redhat-amazonlinux-2-master-py3
......@@ -110,47 +113,33 @@ 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-3004-0-py3
# - env: INSTANCE=debian-debian-10-3004-0-py3
# - env: INSTANCE=debian-debian-9-3004-0-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3004-0-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3004-0-py3
# - env: INSTANCE=redhat-centos-stream8-3004-0-py3
# - env: INSTANCE=redhat-centos-7-3004-0-py3
# - env: INSTANCE=redhat-fedora-34-3004-0-py3
# - env: INSTANCE=debian-debian-11-3004-1-py3
# - env: INSTANCE=debian-debian-10-3004-1-py3
# - env: INSTANCE=debian-debian-9-3004-1-py3
# - env: INSTANCE=ubuntu-ubuntu-2204-3004-1-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3004-1-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3004-1-py3
# - env: INSTANCE=redhat-centos-stream8-3004-1-py3
# - env: INSTANCE=redhat-centos-7-3004-1-py3
# - env: INSTANCE=redhat-fedora-36-3004-1-py3
# - env: INSTANCE=redhat-fedora-35-3004-1-py3
# - env: INSTANCE=redhat-amazonlinux-2-3004-1-py3
# - env: INSTANCE=redhat-oraclelinux-8-3004-1-py3
# - env: INSTANCE=redhat-oraclelinux-7-3004-1-py3
# - env: INSTANCE=redhat-almalinux-8-3004-1-py3
# - env: INSTANCE=redhat-rockylinux-8-3004-1-py3
# - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3
# - env: INSTANCE=redhat-amazonlinux-2-3004-0-py3
# - env: INSTANCE=redhat-oraclelinux-8-3004-0-py3
# - env: INSTANCE=redhat-oraclelinux-7-3004-0-py3
# - env: INSTANCE=redhat-almalinux-8-3004-0-py3
# - env: INSTANCE=redhat-rockylinux-8-3004-0-py3
# - env: INSTANCE=debian-debian-10-3003-3-py3
# - env: INSTANCE=debian-debian-9-3003-3-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
# - env: INSTANCE=redhat-centos-stream8-3003-3-py3
# - env: INSTANCE=redhat-centos-7-3003-3-py3
# - env: INSTANCE=redhat-fedora-35-3003-3-py3
# - env: INSTANCE=redhat-fedora-34-3003-3-py3
# - env: INSTANCE=suse-opensuse-leap-153-3003-3-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-3-py3
# - env: INSTANCE=redhat-amazonlinux-2-3003-3-py3
# - env: INSTANCE=redhat-oraclelinux-8-3003-3-py3
# - env: INSTANCE=redhat-oraclelinux-7-3003-3-py3
# - env: INSTANCE=redhat-almalinux-8-3003-3-py3
# - env: INSTANCE=debian-debian-10-3002-7-py3
# - env: INSTANCE=debian-debian-9-3002-7-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3002-7-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3002-7-py3
# - env: INSTANCE=redhat-centos-7-3002-7-py3
# - env: INSTANCE=redhat-fedora-35-3002-7-py3
# - env: INSTANCE=redhat-fedora-34-3002-7-py3
# - env: INSTANCE=suse-opensuse-leap-153-3002-7-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3002-7-py3
# - env: INSTANCE=redhat-amazonlinux-2-3002-7-py3
# - env: INSTANCE=redhat-oraclelinux-8-3002-7-py3
# - env: INSTANCE=redhat-oraclelinux-7-3002-7-py3
# - env: INSTANCE=debian-debian-10-3003-4-py3
# - env: INSTANCE=debian-debian-9-3003-4-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-4-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-4-py3
# - env: INSTANCE=redhat-centos-stream8-3003-4-py3
# - env: INSTANCE=redhat-centos-7-3003-4-py3
# - env: INSTANCE=redhat-amazonlinux-2-3003-4-py3
# - env: INSTANCE=redhat-oraclelinux-8-3003-4-py3
# - env: INSTANCE=redhat-oraclelinux-7-3003-4-py3
# - env: INSTANCE=redhat-almalinux-8-3003-4-py3
## Define the release stage that runs `semantic-release`
- stage: 'release'
......
Gemfile
View file @ 6bb15478
# 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.
......
Gemfile.lock
View file @ 6bb15478
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
revision: 2c075651c0de1eac9e6bdbf820c03529ad2f59e1
revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
branch: ssf
specs:
inspec (5.7.6)
inspec (5.18.15)
cookstyle
faraday_middleware (>= 0.12.2, < 1.1)
inspec-core (= 5.7.6)
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.7.6)
inspec-core (5.18.15)
addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5)
......@@ -34,13 +34,13 @@ 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)
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8
revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
branch: ssf
specs:
kitchen-docker (2.12.0)
......@@ -49,7 +49,7 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.2.3)
activesupport (7.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
......@@ -58,14 +58,14 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.566.0)
aws-partitions (1.607.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.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.52.0)
aws-sdk-athena (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-autoscaling (1.63.0)
......@@ -83,13 +83,13 @@ 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.68.0)
aws-sdk-cloudformation (1.70.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudfront (1.63.0)
aws-sdk-cloudfront (1.65.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudhsm (1.39.0)
......@@ -98,16 +98,16 @@ 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.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)
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)
......@@ -125,42 +125,42 @@ GEM
aws-sdk-cognitoidentityprovider (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-configservice (1.74.0)
aws-sdk-configservice (1.79.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.129.1)
aws-sdk-core (3.131.2)
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)
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.302.0)
aws-sdk-ec2 (1.322.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.55.0)
aws-sdk-ecr (1.56.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecrpublic (1.12.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecs (1.97.0)
aws-sdk-ecs (1.100.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-eks (1.75.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticache (1.74.0)
aws-sdk-elasticache (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticbeanstalk (1.51.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,31 +187,31 @@ 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.58.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)
aws-sdk-kafka (1.50.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.41.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.55.0)
aws-sdk-kms (1.57.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-lambda (1.80.0)
aws-sdk-lambda (1.84.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
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)
aws-sdk-networkmanager (1.24.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.59.0)
......@@ -220,13 +220,13 @@ GEM
aws-sdk-ram (1.26.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-rds (1.141.0)
aws-sdk-rds (1.148.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-redshift (1.79.0)
aws-sdk-redshift (1.84.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)
......@@ -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.62.0)
aws-sdk-securityhub (1.67.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-servicecatalog (1.60.0)
......@@ -263,16 +263,16 @@ 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)
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.132.0)
aws-sdk-ssm (1.137.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-states (1.39.0)
......@@ -288,7 +288,7 @@ GEM
aws-sdk-core (~> 3, >= 3.122.0)
aws-sigv4 (~> 1.1)
aws-sigv2 (1.1.0)
aws-sigv4 (1.4.0)
aws-sigv4 (1.5.0)
aws-eventstream (~> 1, >= 1.0.2)
azure_graph_rbac (0.17.2)
ms_rest_azure (~> 0.12.0)
......@@ -301,11 +301,11 @@ GEM
azure_mgmt_storage (0.23.0)
ms_rest_azure (~> 0.12.0)
bcrypt_pbkdf (1.1.0)
bson (4.14.1)
bson (4.15.0)
builder (3.2.4)
chef-config (17.9.52)
chef-config (17.10.0)
addressable
chef-utils (= 17.9.52)
chef-utils (= 17.10.0)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
......@@ -313,10 +313,10 @@ GEM
chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
chef-utils (17.9.52)
chef-utils (17.10.0)
concurrent-ruby
coderay (1.1.3)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
cookstyle (7.32.1)
rubocop (= 1.25.1)
declarative (0.0.20)
......@@ -328,7 +328,7 @@ GEM
unf (>= 0.0.5, < 1.0.0)
ed25519 (1.3.0)
erubi (1.10.0)
excon (0.91.0)
excon (0.92.3)
faraday (1.4.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
......@@ -367,27 +367,28 @@ 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)
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)
json (2.6.1)
jwt (2.3.0)
kitchen-inspec (2.5.2)
json (2.6.2)
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)
......@@ -395,21 +396,21 @@ 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)
method_source (1.0.0)
mini_mime (1.1.2)
minitest (5.15.0)
mixlib-config (3.0.9)
minitest (5.16.2)
mixlib-config (3.0.27)
tomlrb
mixlib-install (3.12.16)
mixlib-install (3.12.19)
mixlib-shellout
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)
......@@ -424,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.3)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
......@@ -433,8 +434,8 @@ GEM
nori (2.6.0)
options (2.3.2)
os (1.1.4)
parallel (1.21.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,11 +446,11 @@ 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)
representable (3.1.1)
regexp_parser (2.5.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 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,16 +481,16 @@ 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.19.1)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
rubyzip (2.3.2)
semverse (3.0.0)
signet (0.16.1)
semverse (3.0.2)
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)
......@@ -498,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.1)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
......@@ -516,7 +517,7 @@ GEM
timeliness (0.3.10)
tomlrb (1.3.0)
trailblazer-option (0.1.2)
train (3.8.9)
train (3.10.1)
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.10.1)
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.10.1)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
......@@ -640,8 +641,8 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unicode-display_width (2.1.0)
unf_ext (0.0.8.2)
unicode-display_width (2.2.0)
unicode_utils (1.4.0)
winrm (2.3.6)
builder (>= 2.1.2)
......
bin/kitchen
View file @ 6bb15478
docs/README.rst
View file @ 6bb15478
......@@ -557,6 +557,11 @@ Installs the php-xsl package.
Installs the php-zip package.
``php.zlib``
^^^^^^^^^^^^^^
Installs the php-zlib package.
Testing
-------
......
kitchen.vagrant.yml
View file @ 6bb15478
......@@ -9,8 +9,8 @@ driver:
gui: false
ssh:
shell: /bin/sh
<% unless ENV['CI'] %>
linked_clone: true
<% unless ENV['CI'] %>
synced_folders:
- - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
- '/vagrant'
......
kitchen.yml
View file @ 6bb15478
......@@ -32,6 +32,10 @@ platforms:
driver:
image: saltimages/salt-tiamat-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2204-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-2004-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:ubuntu-20.04
......@@ -75,6 +79,10 @@ platforms:
driver:
image: saltimages/salt-master-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2204-master-py3
driver:
image: saltimages/salt-master-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-2004-master-py3
driver:
image: saltimages/salt-master-py3:ubuntu-20.04
......@@ -89,9 +97,12 @@ platforms:
- name: centos-7-master-py3
driver:
image: saltimages/salt-master-py3:centos-7
- name: fedora-34-master-py3
- name: fedora-36-master-py3
driver:
image: saltimages/salt-master-py3:fedora-34
image: saltimages/salt-master-py3:fedora-36
- name: fedora-35-master-py3
driver:
image: saltimages/salt-master-py3:fedora-35
- name: opensuse-leap-153-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.3
......@@ -132,195 +143,120 @@ 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-2204-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-20.04
image: saltimages/salt-3004.1-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3004-0-py3
- name: ubuntu-2004-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-18.04
image: saltimages/salt-3004.1-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: centos-stream8-3004-0-py3
- name: ubuntu-1804-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:centos-stream8
- name: centos-7-3004-0-py3
image: saltimages/salt-3004.1-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-stream8-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:centos-7
- name: fedora-34-3004-0-py3
image: saltimages/salt-3004.1-py3:centos-stream8
- name: centos-7-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:fedora-34
- name: opensuse-leap-153-3004-0-py3
image: saltimages/salt-3004.1-py3:centos-7
- name: fedora-36-3004-1-py3
driver:
image: saltimages/salt-3004.0-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-3004-0-py3
image: saltimages/salt-3004.1-py3:fedora-36
- name: fedora-35-3004-1-py3
driver:
image: saltimages/salt-3004.0-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-3004-0-py3
image: saltimages/salt-3004.1-py3:fedora-35
- name: amazonlinux-2-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:amazonlinux-2
- name: oraclelinux-8-3004-0-py3
image: saltimages/salt-3004.1-py3:amazonlinux-2
- name: oraclelinux-8-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:oraclelinux-8
- name: oraclelinux-7-3004-0-py3
image: saltimages/salt-3004.1-py3:oraclelinux-8
- name: oraclelinux-7-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:oraclelinux-7
- name: arch-base-latest-3004-0-py3
image: saltimages/salt-3004.1-py3:oraclelinux-7
- name: arch-base-latest-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:arch-base-latest
- name: gentoo-stage3-latest-3004-0-py3
image: saltimages/salt-3004.1-py3:arch-base-latest
- name: gentoo-stage3-latest-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3004-0-py3
- name: gentoo-stage3-systemd-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
- name: almalinux-8-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:almalinux-8
- name: rockylinux-8-3004-0-py3
image: saltimages/salt-3004.1-py3:almalinux-8
- name: rockylinux-8-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:rockylinux-8
image: saltimages/salt-3004.1-py3:rockylinux-8
## SALT `3003.3`
- name: debian-10-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-stream8-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:centos-stream8
- name: centos-7-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:centos-7
- name: fedora-35-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:fedora-35
- name: fedora-34-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:fedora-34
- name: opensuse-leap-153-3003-3-py3
## SALT `3004.0`
- name: opensuse-leap-153-3004-0-py3
driver:
image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
image: saltimages/salt-3004.0-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
- name: opensuse-tmbl-latest-3004-0-py3
driver:
image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3004.0-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
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
## SALT `3002.7`
- name: debian-10-3002-7-py3
## SALT `3003.4`
- name: debian-10-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:debian-10
image: saltimages/salt-3003.4-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3002-7-py3
- name: debian-9-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:debian-9
image: saltimages/salt-3003.4-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3002-7-py3
- name: ubuntu-2004-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:ubuntu-20.04
image: saltimages/salt-3003.4-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3002-7-py3
- name: ubuntu-1804-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:ubuntu-18.04
image: saltimages/salt-3003.4-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
driver:
image: saltimages/salt-3002.7-py3:fedora-35
- name: fedora-34-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:fedora-34
- name: opensuse-leap-153-3002-7-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
- name: centos-stream8-3003-4-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
image: saltimages/salt-3003.4-py3:centos-stream8
- name: centos-7-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:amazonlinux-2
- name: oraclelinux-8-3002-7-py3
image: saltimages/salt-3003.4-py3:centos-7
- name: amazonlinux-2-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:oraclelinux-8
- name: oraclelinux-7-3002-7-py3
image: saltimages/salt-3003.4-py3:amazonlinux-2
- name: oraclelinux-8-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:oraclelinux-7
- name: gentoo-stage3-latest-3002-7-py3
image: saltimages/salt-3003.4-py3:oraclelinux-8
- name: oraclelinux-7-3003-4-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-3003.4-py3:oraclelinux-7
- name: almalinux-8-3003-4-py3
driver:
image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
image: saltimages/salt-3003.4-py3:almalinux-8
verifier:
# https://www.inspec.io/
......@@ -339,13 +275,11 @@ suites:
- debian-11-master-py3
- debian-10-master-py3
- debian-9-master-py3
- debian-11-3004-0-py3
- debian-10-3004-0-py3
- debian-9-3004-0-py3
- debian-10-3003-3-py3
- debian-9-3003-3-py3
- debian-10-3002-7-py3
- debian-9-3002-7-py3
- debian-11-3004-1-py3
- debian-10-3004-1-py3
- debian-9-3004-1-py3
- debian-10-3003-4-py3
- debian-9-3003-4-py3
provisioner:
state_top:
base:
......@@ -369,16 +303,17 @@ suites:
- path: test/integration/default
- name: ubuntu
includes:
- ubuntu-2204-tiamat-py3
- ubuntu-2004-tiamat-py3
- ubuntu-1804-tiamat-py3
- ubuntu-2204-master-py3
- ubuntu-2004-master-py3
- ubuntu-1804-master-py3
- ubuntu-2004-3004-0-py3
- ubuntu-1804-3004-0-py3
- ubuntu-2004-3003-3-py3
- ubuntu-1804-3003-3-py3
- ubuntu-2004-3002-7-py3
- ubuntu-1804-3002-7-py3
- ubuntu-2204-3004-1-py3
- ubuntu-2004-3004-1-py3
- ubuntu-1804-3004-1-py3
- ubuntu-2004-3003-4-py3
- ubuntu-1804-3003-4-py3
provisioner:
state_top:
base:
......@@ -413,34 +348,28 @@ suites:
- rockylinux-8-tiamat-py3
- centos-stream8-master-py3
- centos-7-master-py3
- fedora-34-master-py3
- fedora-36-master-py3
- fedora-35-master-py3
- amazonlinux-2-master-py3
- oraclelinux-8-master-py3
- oraclelinux-7-master-py3
- almalinux-8-master-py3
- rockylinux-8-master-py3
- centos-stream8-3004-0-py3
- centos-7-3004-0-py3
- fedora-34-3004-0-py3
- amazonlinux-2-3004-0-py3
- oraclelinux-8-3004-0-py3
- oraclelinux-7-3004-0-py3
- almalinux-8-3004-0-py3
- rockylinux-8-3004-0-py3
- centos-stream8-3003-3-py3
- centos-7-3003-3-py3
- fedora-35-3003-3-py3
- fedora-34-3003-3-py3
- amazonlinux-2-3003-3-py3
- oraclelinux-8-3003-3-py3
- oraclelinux-7-3003-3-py3
- almalinux-8-3003-3-py3
- centos-7-3002-7-py3
- fedora-35-3002-7-py3
- fedora-34-3002-7-py3
- amazonlinux-2-3002-7-py3
- oraclelinux-8-3002-7-py3
- oraclelinux-7-3002-7-py3
- centos-stream8-3004-1-py3
- centos-7-3004-1-py3
- fedora-36-3004-1-py3
- fedora-35-3004-1-py3
- amazonlinux-2-3004-1-py3
- oraclelinux-8-3004-1-py3
- oraclelinux-7-3004-1-py3
- almalinux-8-3004-1-py3
- rockylinux-8-3004-1-py3
- centos-stream8-3003-4-py3
- centos-7-3003-4-py3
- amazonlinux-2-3003-4-py3
- oraclelinux-8-3003-4-py3
- oraclelinux-7-3003-4-py3
- almalinux-8-3003-4-py3
provisioner:
state_top:
base:
......@@ -463,10 +392,6 @@ suites:
- opensuse-tmbl-latest-master-py3
- opensuse-leap-153-3004-0-py3
- opensuse-tmbl-latest-3004-0-py3
- opensuse-leap-153-3003-3-py3
- opensuse-tmbl-latest-3003-3-py3
- opensuse-leap-153-3002-7-py3
- opensuse-tmbl-latest-3002-7-py3
provisioner:
state_top:
base:
......
php/composer.sls
View file @ 6bb15478
......@@ -45,9 +45,9 @@ update-composer:
cmd.run:
- name: "{{ install_file }} selfupdate"
{% if grains['os_family'] == 'FreeBSD' %}
- unless: test $(date -v+60d -j -f "%Y-%m-%d %H:%M:%S" "$({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
- unless: test $(date -v+60d -j -f "%Y-%m-%d %H:%M:%S" "$({{ install_file }} --version --no-interaction | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
{% else %}
- unless: test $(date -d "60 days $({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
- unless: test $(date -d "60 days $({{ install_file }} --version --no-interaction | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
{% endif %}
- cwd: {{ php.lookup.pkgs.local_bin }}
- env:
......
php/map.jinja
View file @ 6bb15478
......@@ -3122,11 +3122,15 @@
'filter': 'php' + freebsd_php_version + '-filter',
'fileinfo': 'php' + freebsd_php_version + '-fileinfo',
'fpm': 'php' + freebsd_php_version,
'gettext': 'php' + freebsd_php_version + '-gettext',
'gd': 'php' + freebsd_php_version + '-gd',
'hash': 'php' + freebsd_php_version + '-hash',
'iconv': 'php' + freebsd_php_version + '-iconv',
'imagick': 'php' + freebsd_php_version + '-pecl-imagick',
'imap': 'php' + freebsd_php_version + '-imap',
'intl': 'php' + freebsd_php_version + '-intl',
'json': 'php' + freebsd_php_version + '-json',
'ldap': 'php' + freebsd_php_version + '-ldap',
'local_bin': '/usr/local/bin',
'memcached': 'php' + freebsd_php_version + '-pecl-memcached',
'mbstring': 'php' + freebsd_php_version + '-mbstring',
......@@ -3151,6 +3155,7 @@
'xmlwriter': 'php' + freebsd_php_version + '-xmlwriter',
'xsl': 'php' + freebsd_php_version + '-xsl',
'zip': 'php' + freebsd_php_version + '-zip',
'zlib': 'php' + freebsd_php_version + '-zlib',
},
'fpm': {
'conf': '/usr/local/etc/php-fpm.conf',
......
test/integration/default/files/_mapdata/fedora-35.yaml 0 → 100644
View file @ 6bb15478
# yamllint disable rule:indentation rule:line-length
# Fedora-35
---
values:
apache2:
ini:
opts: {}
settings: {}
cli:
ini:
opts: {}
settings: {}
fpm:
config:
conf:
opts: {}
settings: {}
ini:
opts: {}
settings: {}
pools:
default.conf:
enabled: false
opts: {}
service:
enabled: true
opts: {}
hhvm:
config:
php:
opts: {}
settings: {}
server:
opts: {}
settings: {}
service:
enabled: true
opts: {}
ini:
defaults:
CLI Server:
cli_server.color: 'On'
Date:
date.timezone: America/New_York
Interbase:
ibase.allow_persistent: 1
ibase.dateformat: '"%Y-%m-%d"'
ibase.max_links: -1
ibase.max_persistent: -1
ibase.timeformat: '"%H:%M:%S"'
ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
MSSQL:
mssql.allow_persistent: 'On'
mssql.compatibility_mode: 'Off'
mssql.max_links: -1
mssql.max_persistent: -1
mssql.min_error_severity: 10
mssql.min_message_severity: 10
mssql.secure_connection: 'Off'
MySQL:
mysql.allow_local_infile: 'On'
mysql.allow_persistent: 'On'
mysql.cache_size: '2000'
mysql.connect_timeout: 60
mysql.max_links: -1
mysql.max_persistent: -1
mysql.trace_mode: 'Off'
MySQLi:
mysqli.allow_persistent: 'On'
mysqli.cache_size: 2000
mysqli.default_port: 3306
mysqli.max_links: -1
mysqli.max_persistent: -1
mysqli.reconnect: 'Off'
ODBC:
odbc.allow_persistent: 'On'
odbc.check_persistent: 'On'
odbc.defaultbinmode: 1
odbc.defaultlrl: 4096
odbc.max_links: '-1'
odbc.max_persistent: '-1'
PHP:
allow_url_fopen: 'On'
allow_url_include: 'Off'
asp_tags: 'Off'
auto_globals_jit: 'On'
default_mimetype: '"text/html"'
default_socket_timeout: 60
disable_functions:
- pcntl_alarm
- pcntl_fork
- pcntl_waitpid
- pcntl_wait
- pcntl_wifexited
- pcntl_wifstopped
- pcntl_wifsignaled
- pcntl_wexitstatus
- pcntl_wtermsig
- pcntl_wstopsig
- pcntl_signal
- pcntl_signal_dispatch
- pcntl_get_last_error
- pcntl_strerror
- pcntl_sigprocmask
- pcntl_sigwaitinfo
- pcntl_sigtimedwait
- pcntl_exec
- pcntl_getpriority
- pcntl_setpriority
display_errors: 'Off'
display_startup_errors: 'Off'
enable_dl: 'Off'
engine: 'On'
error_reporting:
- E_ALL
- ~E_DEPRECATED
- ~E_STRICT
expose_php: 'On'
file_uploads: 'On'
html_errors: 'On'
ignore_repeated_errors: 'Off'
ignore_repeated_source: 'Off'
implicit_flush: 'Off'
log_errors: 'On'
log_errors_max_len: 1024
max_execution_time: 30
max_file_uploads: 20
max_input_nesting_level: 64
max_input_time: 60
max_input_vars: 1000
memory_limit: 128M
output_buffering: 4096
post_max_size: 8M
precision: 14
register_argc_argv: 'Off'
report_memleaks: 'On'
request_order: GP
serialize_precision: 17
short_open_tag: 'Off'
track_errors: 'Off'
upload_max_filesize: 2M
variables_order: GPCS
zend.enable_gc: 'On'
zlib.output_compression: 'Off'
Pdo_mysql:
pdo_mysql.cache_size: 2000
PostgreSQL:
pgsql.allow_persistent: 'On'
pgsql.auto_reset_persistent: 'Off'
pgsql.ignore_notice: 0
pgsql.log_notice: 0
pgsql.max_links: -1
pgsql.max_persistent: -1
SQL:
sql.safe_mode: 'Off'
Session:
session.auto_start: 0
session.bug_compat_42: 'Off'
session.bug_compat_warn: 'Off'
session.cache_expire: '180'
session.cache_limiter: nocache
session.cookie_lifetime: 0
session.cookie_path: /
session.gc_divisor: 1000
session.gc_maxlifetime: 1440
session.gc_probability: 0
session.hash_bits_per_character: 5
session.hash_function: 0
session.name: PHPSESSID
session.save_handler: files
session.serialize_handler: php
session.use_cookies: 1
session.use_only_cookies: 1
session.use_strict_mode: 0
session.use_trans_sid: 0
url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
Sybase-CT:
sybct.allow_persistent: 'On'
sybct.max_links: -1
sybct.max_persistent: -1
sybct.min_client_severity: 10
sybct.min_server_severity: 10
Tidy:
tidy.clean_output: 'Off'
bcmath:
bcmath.scale: 0
ldap:
ldap.max_links: -1
mail function:
SMTP: localhost
mail.add_x_header: 'On'
mysqlnd:
mysqlnd.collect_memory_statistics: 'Off'
mysqlnd.collect_statistics: 'On'
soap:
soap.wsdl_cache_dir: '"/tmp"'
soap.wsdl_cache_enabled: 1
soap.wsdl_cache_limit: 5
soap.wsdl_cache_ttl: 86400
lookup:
cli:
ini: /etc/php.ini
fpm:
conf: /etc/php-fpm.conf
defaults:
global:
error_log: /var/log/php-fpm/error.log
pid: /var/run/php-fpm/php-fpm.pid
include: /etc/php-fpm.d/*.conf
group: root
ini: /etc/php.ini
pools: /etc/php-fpm.d
service: php-fpm
user: root
pkgs:
adodb: php-adodb
apc: php-pecl-apc
apcu: php-pecl-apcu
auth-sasl: php-pear-Auth-SASL
bcmath: php-bcmath
build_pkgs:
- openssl-devel
- gcc
cache-lite: php-pear-Cache-Lite
cgi: php-cgi
cli: php-cli
composer: composer
composer_bin: composer
console-table: php-pear-Console-Table
curl:
- php-common
- curl
dba:
- php-dba
- dba
dev: php-devel
ext_conf_path: /etc/php.d
fpm: php-fpm
gd: php-gd
geoip: php-pecl-geoip
geshi: php-geshi
gettext: php-php-gettext
http: php-pecl-http
imagick: php-pecl-imagick
imap: php-imap
intl: php-intl
json: php-common
ldap: php-ldap
local_bin: /usr/local/bin
mail: php-pear-Mail
mbstring: php-mbstring
mcrypt: php-mcrypt
memcache: php-pecl-memcache
memcached: php-pecl-memcached
mysql: php-mysql
mysqlnd: php-mysqlnd
net-smtp: php-pear-Net-SMTP
net4: php-pear-Net-IPv4
oauth: php-pecl-oauth
opcache: php-pecl-zendopcache
pear: php-pear
pgsql: php-pgsql
php: php
pspell: php-pspell
redis: php-pecl-redis
seclib: php-phpseclib
snmp: php-snmp
soap: php-soap
sqlite: php-pdo
ssh2: php-pecl-ssh2
suhosin5_ext: suhosin.so
suhosin5_repo: https://github.com/sektioneins/suhosin
suhosin7_ext: suhosin7.so
suhosin7_repo: https://github.com/sektioneins/suhosin7
tcpdf: php-tcpdf
temp_dir: /tmp
tidy: php-tidy
uuid: php-pecl-uuid
xcache: php-xcache
xdebug: php-pecl-xdebug
xml:
- php-xml
- php-xmlrpc
xsl: php-xml
zip: php
xcache:
ini: /etc/php.d/xcache.ini
xcache:
ini:
defaults:
xcache:
xcache.cacher: 'On'
xcache.coredump_directory: '""'
xcache.coredump_type: '0'
xcache.count: '1'
xcache.disable_on_crash: 'Off'
xcache.experimental: 'Off'
xcache.gc_interval: '0'
xcache.mmap_path: '"/dev/zero"'
xcache.optimizer: 'Off'
xcache.readonly_protection: 'Off'
xcache.shm_scheme: '"mmap"'
xcache.size: 60M
xcache.slots: 8K
xcache.stat: 'On'
xcache.ttl: '0'
xcache.var_count: '1'
xcache.var_gc_interval: '300'
xcache.var_maxttl: '0'
xcache.var_namespace: '""'
xcache.var_namespace_mode: '0'
xcache.var_size: 4M
xcache.var_slots: 8K
xcache.var_ttl: '0'
xcache-common:
extension: xcache.so
xcache.admin:
xcache.admin.enable_auth: 'On'
xcache.coverager:
xcache.coveragedump_directory: '""'
xcache.coverager: 'Off'
xcache.coverager_autostart: 'On'
opts: {}
settings: {}
test/integration/default/files/_mapdata/fedora-36.yaml 0 → 100644
View file @ 6bb15478
# yamllint disable rule:indentation rule:line-length
# Fedora-36
---
values:
apache2:
ini:
opts: {}
settings: {}
cli:
ini:
opts: {}
settings: {}
fpm:
config:
conf:
opts: {}
settings: {}
ini:
opts: {}
settings: {}
pools:
default.conf:
enabled: false
opts: {}
service:
enabled: true
opts: {}
hhvm:
config:
php:
opts: {}
settings: {}
server:
opts: {}
settings: {}
service:
enabled: true
opts: {}
ini:
defaults:
CLI Server:
cli_server.color: 'On'
Date:
date.timezone: America/New_York
Interbase:
ibase.allow_persistent: 1
ibase.dateformat: '"%Y-%m-%d"'
ibase.max_links: -1
ibase.max_persistent: -1
ibase.timeformat: '"%H:%M:%S"'
ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
MSSQL:
mssql.allow_persistent: 'On'
mssql.compatibility_mode: 'Off'
mssql.max_links: -1
mssql.max_persistent: -1
mssql.min_error_severity: 10
mssql.min_message_severity: 10
mssql.secure_connection: 'Off'
MySQL:
mysql.allow_local_infile: 'On'
mysql.allow_persistent: 'On'
mysql.cache_size: '2000'
mysql.connect_timeout: 60
mysql.max_links: -1
mysql.max_persistent: -1
mysql.trace_mode: 'Off'
MySQLi:
mysqli.allow_persistent: 'On'
mysqli.cache_size: 2000
mysqli.default_port: 3306
mysqli.max_links: -1
mysqli.max_persistent: -1
mysqli.reconnect: 'Off'
ODBC:
odbc.allow_persistent: 'On'
odbc.check_persistent: 'On'
odbc.defaultbinmode: 1
odbc.defaultlrl: 4096
odbc.max_links: '-1'
odbc.max_persistent: '-1'
PHP:
allow_url_fopen: 'On'
allow_url_include: 'Off'
asp_tags: 'Off'
auto_globals_jit: 'On'
default_mimetype: '"text/html"'
default_socket_timeout: 60
disable_functions:
- pcntl_alarm
- pcntl_fork
- pcntl_waitpid
- pcntl_wait
- pcntl_wifexited
- pcntl_wifstopped
- pcntl_wifsignaled
- pcntl_wexitstatus
- pcntl_wtermsig
- pcntl_wstopsig
- pcntl_signal
- pcntl_signal_dispatch
- pcntl_get_last_error
- pcntl_strerror
- pcntl_sigprocmask
- pcntl_sigwaitinfo
- pcntl_sigtimedwait
- pcntl_exec
- pcntl_getpriority
- pcntl_setpriority
display_errors: 'Off'
display_startup_errors: 'Off'
enable_dl: 'Off'
engine: 'On'
error_reporting:
- E_ALL
- ~E_DEPRECATED
- ~E_STRICT
expose_php: 'On'
file_uploads: 'On'
html_errors: 'On'
ignore_repeated_errors: 'Off'
ignore_repeated_source: 'Off'
implicit_flush: 'Off'
log_errors: 'On'
log_errors_max_len: 1024
max_execution_time: 30
max_file_uploads: 20
max_input_nesting_level: 64
max_input_time: 60
max_input_vars: 1000
memory_limit: 128M
output_buffering: 4096
post_max_size: 8M
precision: 14
register_argc_argv: 'Off'
report_memleaks: 'On'
request_order: GP
serialize_precision: 17
short_open_tag: 'Off'
track_errors: 'Off'
upload_max_filesize: 2M
variables_order: GPCS
zend.enable_gc: 'On'
zlib.output_compression: 'Off'
Pdo_mysql:
pdo_mysql.cache_size: 2000
PostgreSQL:
pgsql.allow_persistent: 'On'
pgsql.auto_reset_persistent: 'Off'
pgsql.ignore_notice: 0
pgsql.log_notice: 0
pgsql.max_links: -1
pgsql.max_persistent: -1
SQL:
sql.safe_mode: 'Off'
Session:
session.auto_start: 0
session.bug_compat_42: 'Off'
session.bug_compat_warn: 'Off'
session.cache_expire: '180'
session.cache_limiter: nocache
session.cookie_lifetime: 0
session.cookie_path: /
session.gc_divisor: 1000
session.gc_maxlifetime: 1440
session.gc_probability: 0
session.hash_bits_per_character: 5
session.hash_function: 0
session.name: PHPSESSID
session.save_handler: files
session.serialize_handler: php
session.use_cookies: 1
session.use_only_cookies: 1
session.use_strict_mode: 0
session.use_trans_sid: 0
url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
Sybase-CT:
sybct.allow_persistent: 'On'
sybct.max_links: -1
sybct.max_persistent: -1
sybct.min_client_severity: 10
sybct.min_server_severity: 10
Tidy:
tidy.clean_output: 'Off'
bcmath:
bcmath.scale: 0
ldap:
ldap.max_links: -1
mail function:
SMTP: localhost
mail.add_x_header: 'On'
mysqlnd:
mysqlnd.collect_memory_statistics: 'Off'
mysqlnd.collect_statistics: 'On'
soap:
soap.wsdl_cache_dir: '"/tmp"'
soap.wsdl_cache_enabled: 1
soap.wsdl_cache_limit: 5
soap.wsdl_cache_ttl: 86400
lookup:
cli:
ini: /etc/php.ini
fpm:
conf: /etc/php-fpm.conf
defaults:
global:
error_log: /var/log/php-fpm/error.log
pid: /var/run/php-fpm/php-fpm.pid
include: /etc/php-fpm.d/*.conf
group: root
ini: /etc/php.ini
pools: /etc/php-fpm.d
service: php-fpm
user: root
pkgs:
adodb: php-adodb
apc: php-pecl-apc
apcu: php-pecl-apcu
auth-sasl: php-pear-Auth-SASL
bcmath: php-bcmath
build_pkgs:
- openssl-devel
- gcc
cache-lite: php-pear-Cache-Lite
cgi: php-cgi
cli: php-cli
composer: composer
composer_bin: composer
console-table: php-pear-Console-Table
curl:
- php-common
- curl
dba:
- php-dba
- dba
dev: php-devel
ext_conf_path: /etc/php.d
fpm: php-fpm
gd: php-gd
geoip: php-pecl-geoip
geshi: php-geshi
gettext: php-php-gettext
http: php-pecl-http
imagick: php-pecl-imagick
imap: php-imap
intl: php-intl
json: php-common
ldap: php-ldap
local_bin: /usr/local/bin
mail: php-pear-Mail
mbstring: php-mbstring
mcrypt: php-mcrypt
memcache: php-pecl-memcache
memcached: php-pecl-memcached
mysql: php-mysql
mysqlnd: php-mysqlnd
net-smtp: php-pear-Net-SMTP
net4: php-pear-Net-IPv4
oauth: php-pecl-oauth
opcache: php-pecl-zendopcache
pear: php-pear
pgsql: php-pgsql
php: php
pspell: php-pspell
redis: php-pecl-redis
seclib: php-phpseclib
snmp: php-snmp
soap: php-soap
sqlite: php-pdo
ssh2: php-pecl-ssh2
suhosin5_ext: suhosin.so
suhosin5_repo: https://github.com/sektioneins/suhosin
suhosin7_ext: suhosin7.so
suhosin7_repo: https://github.com/sektioneins/suhosin7
tcpdf: php-tcpdf
temp_dir: /tmp
tidy: php-tidy
uuid: php-pecl-uuid
xcache: php-xcache
xdebug: php-pecl-xdebug
xml:
- php-xml
- php-xmlrpc
xsl: php-xml
zip: php
xcache:
ini: /etc/php.d/xcache.ini
xcache:
ini:
defaults:
xcache:
xcache.cacher: 'On'
xcache.coredump_directory: '""'
xcache.coredump_type: '0'
xcache.count: '1'
xcache.disable_on_crash: 'Off'
xcache.experimental: 'Off'
xcache.gc_interval: '0'
xcache.mmap_path: '"/dev/zero"'
xcache.optimizer: 'Off'
xcache.readonly_protection: 'Off'
xcache.shm_scheme: '"mmap"'
xcache.size: 60M
xcache.slots: 8K
xcache.stat: 'On'
xcache.ttl: '0'
xcache.var_count: '1'
xcache.var_gc_interval: '300'
xcache.var_maxttl: '0'
xcache.var_namespace: '""'
xcache.var_namespace_mode: '0'
xcache.var_size: 4M
xcache.var_slots: 8K
xcache.var_ttl: '0'
xcache-common:
extension: xcache.so
xcache.admin:
xcache.admin.enable_auth: 'On'
xcache.coverager:
xcache.coveragedump_directory: '""'
xcache.coverager: 'Off'
xcache.coverager_autostart: 'On'
opts: {}
settings: {}
test/integration/default/files/_mapdata/freebsd-12.yaml
View file @ 6bb15478
......@@ -235,10 +235,14 @@ values:
filter: php74-filter
fpm: php74
gd: php74-gd
gettext: php74-gettext
hash: php74-hash
iconv: php74-iconv
imagick: php74-pecl-imagick
imap: php74-imap
intl: php74-intl
json: php74-json
ldap: php74-ldap
local_bin: /usr/local/bin
mbstring: php74-mbstring
mcrypt: php74-mcrypt
......@@ -266,6 +270,7 @@ values:
xmlwriter: php74-xmlwriter
xsl: php74-xsl
zip: php74-zip
zlib: php74-zlib
version:
- '7.4'
- '8.0'
......
test/integration/default/files/_mapdata/freebsd-13.yaml
View file @ 6bb15478
......@@ -235,10 +235,14 @@ values:
filter: php74-filter
fpm: php74
gd: php74-gd
gettext: php74-gettext
hash: php74-hash
iconv: php74-iconv
imagick: php74-pecl-imagick
imap: php74-imap
intl: php74-intl
json: php74-json
ldap: php74-ldap
local_bin: /usr/local/bin
mbstring: php74-mbstring
mcrypt: php74-mcrypt
......@@ -266,6 +270,7 @@ values:
xmlwriter: php74-xmlwriter
xsl: php74-xsl
zip: php74-zip
zlib: php74-zlib
version:
- '7.4'
- '8.0'
......
test/integration/default/files/_mapdata/ubuntu-22.yaml 0 → 100644
View file @ 6bb15478
# yamllint disable rule:indentation rule:line-length
# Ubuntu-22.04
---
values:
apache2:
ini:
opts: {}
settings: {}
cli:
ini:
opts: {}
settings:
Assertion:
zend.assertions: -1
Date:
date.timezone: Europe/Paris
PHP:
default_charset: UTF-8
fpm:
config:
conf:
opts: {}
settings: {}
ini:
opts: {}
settings:
Assertion:
zend.assertions: -1
Date:
date.timezone: Europe/Paris
PHP:
cgi.fix_pathinfo: 0
default_charset: UTF-8
expose_php: 'Off'
pools:
ldap-admin.conf:
enabled: true
phpversion: '7.3'
settings:
ldap-admin:
catch_workers_output: 'yes'
group: www-data
listen: /tmp/php-fpm-ldap-admin2.sock
listen.mode: '0666'
php_admin_value[date.timezone]: Europe/Paris
ping.path: /php-ping
pm: static
pm.max_children: 3
pm.max_requests: 500
pm.status_path: /php-status
security.limit_extensions: .php
user: www-data
radius-admin.conf:
enabled: true
phpversion: '5.6'
settings:
radius-admin:
catch_workers_output: 'yes'
group: www-data
listen: /tmp/php-fpm-radius-admin.sock
listen.mode: '0666'
php_admin_value[date.timezone]: Europe/Paris
ping.path: /php-ping
pm: static
pm.max_children: 3
pm.max_requests: 500
pm.status_path: /php-status
security.limit_extensions: .php
user: www-data
service:
enabled: true
opts: {}
hhvm:
config:
php:
opts: {}
settings: {}
server:
opts: {}
settings: {}
service:
enabled: true
opts: {}
ini:
defaults:
CLI Server:
cli_server.color: 'On'
Date:
date.timezone: America/New_York
Interbase:
ibase.allow_persistent: 1
ibase.dateformat: '"%Y-%m-%d"'
ibase.max_links: -1
ibase.max_persistent: -1
ibase.timeformat: '"%H:%M:%S"'
ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
MSSQL:
mssql.allow_persistent: 'On'
mssql.compatibility_mode: 'Off'
mssql.max_links: -1
mssql.max_persistent: -1
mssql.min_error_severity: 10
mssql.min_message_severity: 10
mssql.secure_connection: 'Off'
MySQL:
mysql.allow_local_infile: 'On'
mysql.allow_persistent: 'On'
mysql.cache_size: '2000'
mysql.connect_timeout: 60
mysql.max_links: -1
mysql.max_persistent: -1
mysql.trace_mode: 'Off'
MySQLi:
mysqli.allow_persistent: 'On'
mysqli.cache_size: 2000
mysqli.default_port: 3306
mysqli.max_links: -1
mysqli.max_persistent: -1
mysqli.reconnect: 'Off'
ODBC:
odbc.allow_persistent: 'On'
odbc.check_persistent: 'On'
odbc.defaultbinmode: 1
odbc.defaultlrl: 4096
odbc.max_links: '-1'
odbc.max_persistent: '-1'
PHP:
allow_url_fopen: 'On'
allow_url_include: 'Off'
asp_tags: 'Off'
auto_globals_jit: 'On'
default_mimetype: '"text/html"'
default_socket_timeout: 60
disable_functions:
- pcntl_alarm
- pcntl_fork
- pcntl_waitpid
- pcntl_wait
- pcntl_wifexited
- pcntl_wifstopped
- pcntl_wifsignaled
- pcntl_wexitstatus
- pcntl_wtermsig
- pcntl_wstopsig
- pcntl_signal
- pcntl_signal_dispatch
- pcntl_get_last_error
- pcntl_strerror
- pcntl_sigprocmask
- pcntl_sigwaitinfo
- pcntl_sigtimedwait
- pcntl_exec
- pcntl_getpriority
- pcntl_setpriority
display_errors: 'Off'
display_startup_errors: 'Off'
enable_dl: 'Off'
engine: 'On'
error_reporting:
- E_ALL
- ~E_DEPRECATED
- ~E_STRICT
expose_php: 'On'
file_uploads: 'On'
html_errors: 'On'
ignore_repeated_errors: 'Off'
ignore_repeated_source: 'Off'
implicit_flush: 'Off'
log_errors: 'On'
log_errors_max_len: 1024
max_execution_time: 30
max_file_uploads: 20
max_input_nesting_level: 64
max_input_time: 60
max_input_vars: 1000
memory_limit: 128M
output_buffering: 4096
post_max_size: 8M
precision: 14
register_argc_argv: 'Off'
report_memleaks: 'On'
request_order: GP
serialize_precision: 17
short_open_tag: 'Off'
track_errors: 'Off'
upload_max_filesize: 2M
variables_order: GPCS
zend.enable_gc: 'On'
zlib.output_compression: 'Off'
Pdo_mysql:
pdo_mysql.cache_size: 2000
PostgreSQL:
pgsql.allow_persistent: 'On'
pgsql.auto_reset_persistent: 'Off'
pgsql.ignore_notice: 0
pgsql.log_notice: 0
pgsql.max_links: -1
pgsql.max_persistent: -1
SQL:
sql.safe_mode: 'Off'
Session:
session.auto_start: 0
session.bug_compat_42: 'Off'
session.bug_compat_warn: 'Off'
session.cache_expire: '180'
session.cache_limiter: nocache
session.cookie_lifetime: 0
session.cookie_path: /
session.gc_divisor: 1000
session.gc_maxlifetime: 1440
session.gc_probability: 0
session.hash_bits_per_character: 5
session.hash_function: 0
session.name: PHPSESSID
session.save_handler: files
session.serialize_handler: php
session.use_cookies: 1
session.use_only_cookies: 1
session.use_strict_mode: 0
session.use_trans_sid: 0
url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
Sybase-CT:
sybct.allow_persistent: 'On'
sybct.max_links: -1
sybct.max_persistent: -1
sybct.min_client_severity: 10
sybct.min_server_severity: 10
Tidy:
tidy.clean_output: 'Off'
bcmath:
bcmath.scale: 0
ldap:
ldap.max_links: -1
mail function:
SMTP: localhost
mail.add_x_header: 'On'
mysqlnd:
mysqlnd.collect_memory_statistics: 'Off'
mysqlnd.collect_statistics: 'On'
soap:
soap.wsdl_cache_dir: '"/tmp"'
soap.wsdl_cache_enabled: 1
soap.wsdl_cache_limit: 5
soap.wsdl_cache_ttl: 86400
lookup:
apache2:
ini: /etc/php/5.6/apache2/php.ini
cli:
ini: /etc/php/5.6/cli/php.ini
fpm:
conf: /etc/php/5.6/fpm/php-fpm.conf
defaults:
global:
error_log: /var/log/php5.6-fpm.log
pid: /run/php/php5.6-fpm.pid
include: /etc/php/5.6/fpm/pool.d/*.conf
group: root
ini: /etc/php/5.6/fpm/php.ini
pools: /etc/php/5.6/fpm/pool.d
service: php5.6-fpm
user: root
hhvm:
conf: /etc/hhvm/server.ini
defaults: {}
ini: /etc/hhvm/php.ini
php:
hhvm.log.always_log_unhandled_exceptions: 'true'
hhvm.log.level: Warning
hhvm.log.runtime_error_reporting_level: '8191'
hhvm.mysql.typed_results: 'false'
session.gc_maxlifetime: '1440'
session.save_handler: files
session.save_path: /var/lib/hhvm/sessions
server:
hhvm.log.file: /var/log/hhvm/error.log
hhvm.log.use_log_file: 'true'
hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
hhvm.server.default_document: index.php
hhvm.server.port: '9000'
hhvm.server.type: fastcgi
pid: /var/run/hhvm/pid
service: hhvm
pkgs:
adodb: libphp-adodb
apache2: libapache2-mod-php5.6
apc: php-apcu
apcu: php-apcu-bc
auth-sasl: php-auth-sasl
bcmath: php5.6-bcmath
build_pkgs:
- libssl-dev
- libcurl4-openssl-dev
- pkg-config
- libsslcommon2-dev
- gcc
- make
- autoconf
- libc-dev
- pkg-config
bz2: php5.6-bz2
cache-lite: php-cache-lite
cgi: php5.6-cgi
cli: php5.6-cli
composer_bin: composer
console-table: php-console-table
curl: php5.6-curl
dba: php5.6-dba
dev: php5.6-dev
ext_conf_path: /etc/php/5.6/mods-available
fpm: php5.6-fpm
gd: php5.6-gd
gearman: php-gearman
geoip: php-geoip
geshi: php-geshi
gettext: php5.6
gmp: php5.6-gmp
hhvm: hhvm
imagick: php-imagick
imap: php5.6-imap
intl: php5.6-intl
json: php5.6-json
ldap: php5.6-ldap
local_bin: /usr/local/bin
mail: php-mail
mbstring: php5.6-mbstring
mcrypt: php5.6-mcrypt
memcache: php-memcache
memcached: php-memcached
mongo: php-mongo
mongodb: php-mongodb
mysql: php5.6-mysql
mysqlnd: php5.6-mysql
net-smtp: php-net-smtp
net4: php-net-ipv4
net6: php-net-ipv6
oauth: php-oauth
odbc: php-odbc
opcache: php5.6-opcache
pear: php-pear
pgsql: php5.6-pgsql
php: php5.6
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib
snmp: php5.6-snmp
soap: php5.6-soap
sqlite: php5.6-sqlite3
ssh2: php-ssh2
suhosin5_ext: suhosin.so
suhosin5_repo: https://github.com/sektioneins/suhosin
suhosin7_ext: suhosin7.so
suhosin7_repo: https://github.com/sektioneins/suhosin7
sybase: php5.6-sybase
tcpdf: php-tcpdf
temp_dir: /tmp
tidy: php5.6-tidy
xdebug: php-xdebug
xml:
- php5.6-xml
- php5.6-xmlrpc
xsl: php5.6-xsl
zip: php5.6-zip
modules:
- bz2
- cli
- curl
- gd
- imagick
- imap
- intl
- mbstring
- mysql
- readline
- redis
- xdebug
- xml
- zip
repo:
file: /etc/apt/sources.list.d/php-sury.list
humanname: php-sury ppa
key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
name: deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main
use_external_repo: true
version:
- '5.6'
- '7.3'
test/integration/default/inspec.yml
View file @ 6bb15478
......@@ -24,4 +24,5 @@ supports:
- platform-name: gentoo
- platform-name: almalinux
- platform-name: rocky
- platform-name: mac_os_x
- platform: windows
test/integration/share/inspec.yml
View file @ 6bb15478
......@@ -21,4 +21,5 @@ supports:
- platform-name: gentoo
- platform-name: almalinux
- platform-name: rocky
- platform-name: mac_os_x
- platform: windows
test/integration/share/libraries/system.rb
View file @ 6bb15478
......@@ -57,6 +57,8 @@ class SystemResource < Inspec.resource(1)
'base-latest'
when 'gentoo'
"#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
when 'mac_os_x'
inspec.command('sw_vers -productVersion').stdout.to_s
when 'opensuse'
# rubocop:disable Style/NumericLiterals,Layout/LineLength
inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
......@@ -95,6 +97,8 @@ class SystemResource < Inspec.resource(1)
# 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'
......