Merge branch 'master' into refactor2

This commit is contained in:
N 2020-06-30 15:29:08 +01:00 committed by GitHub
commit 9a4923ec2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 250 additions and 229 deletions

View File

@ -117,3 +117,15 @@ jobs:
edge: true edge: true
# Run `semantic-release` # Run `semantic-release`
script: 'npx semantic-release@15.14' script: 'npx semantic-release@15.14'
# Notification options: `always`, `never` or `change`
notifications:
webhooks:
if: 'repo = saltstack-formulas/prometheus-formula'
urls:
- https://saltstack-formulas.zulipchat.com/api/v1/external/travis?api_key=HsIq3o5QmLxdnVCKF9is0FUIpkpAY79P&stream=CI&topic=saltstack-formulas%2Fprometheus-formula&ignore_pull_requests=true
on_success: always # default: always
on_failure: always # default: always
on_start: always # default: never
on_cancel: always # default: always
on_error: always # default: always

View File

@ -1,7 +1,7 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (5.2.4.2) activesupport (5.2.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -9,180 +9,185 @@ GEM
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
aws-eventstream (1.1.0) aws-eventstream (1.1.0)
aws-partitions (1.299.0) aws-partitions (1.335.0)
aws-sdk-apigateway (1.38.0) aws-sdk-apigateway (1.47.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-apigatewayv2 (1.19.0) aws-sdk-apigatewayv2 (1.23.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-athena (1.24.0) aws-sdk-athena (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-autoscaling (1.22.0) aws-sdk-autoscaling (1.22.0)
aws-sdk-core (~> 3, >= 3.52.1) aws-sdk-core (~> 3, >= 3.52.1)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-budgets (1.28.0) aws-sdk-budgets (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudformation (1.33.0) aws-sdk-cloudformation (1.39.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudhsm (1.20.0) aws-sdk-cloudfront (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudhsmv2 (1.21.0) aws-sdk-cloudhsm (1.24.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudtrail (1.21.0) aws-sdk-cloudhsmv2 (1.25.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudwatch (1.36.0) aws-sdk-cloudtrail (1.25.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudwatchlogs (1.29.0) aws-sdk-cloudwatch (1.40.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-codecommit (1.31.0) aws-sdk-cloudwatchlogs (1.33.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-codedeploy (1.28.0) aws-sdk-codecommit (1.36.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-codepipeline (1.29.0) aws-sdk-codedeploy (1.33.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-configservice (1.43.0) aws-sdk-codepipeline (1.33.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-core (3.94.0) aws-sdk-configservice (1.47.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.102.1)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-costandusagereportservice (1.19.0) aws-sdk-costandusagereportservice (1.23.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-dynamodb (1.45.0) aws-sdk-dynamodb (1.50.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ec2 (1.154.0) aws-sdk-ec2 (1.171.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.26.0) aws-sdk-ecr (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ecs (1.60.0) aws-sdk-ecs (1.66.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-eks (1.35.0) aws-sdk-efs (1.31.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticache (1.31.0) aws-sdk-eks (1.39.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticbeanstalk (1.28.0) aws-sdk-elasticache (1.39.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticloadbalancing (1.20.0) aws-sdk-elasticbeanstalk (1.33.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticloadbalancingv2 (1.41.0) aws-sdk-elasticloadbalancing (1.24.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticsearchservice (1.32.0) aws-sdk-elasticloadbalancingv2 (1.46.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-firehose (1.25.0) aws-sdk-elasticsearchservice (1.38.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.36.0) aws-sdk-firehose (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kafka (1.19.0) aws-sdk-iam (1.42.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.21.0) aws-sdk-kafka (1.23.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kms (1.30.0) aws-sdk-kinesis (1.25.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-lambda (1.39.0) aws-sdk-kms (1.35.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-lambda (1.45.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.17.0) aws-sdk-organizations (1.17.0)
aws-sdk-core (~> 3, >= 3.39.0) aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0) aws-sigv4 (~> 1.0)
aws-sdk-rds (1.82.0) aws-sdk-rds (1.89.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-redshift (1.40.0) aws-sdk-redshift (1.45.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-route53 (1.32.0) aws-sdk-route53 (1.39.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-route53domains (1.19.0) aws-sdk-route53domains (1.24.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-route53resolver (1.12.0) aws-sdk-route53resolver (1.16.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.62.0) aws-sdk-s3 (1.71.1)
aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-core (~> 3, >= 3.102.1)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-securityhub (1.23.0) aws-sdk-securityhub (1.28.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ses (1.28.0) aws-sdk-ses (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-sms (1.18.0) aws-sdk-sms (1.22.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-sns (1.22.0) aws-sdk-sns (1.26.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-sqs (1.24.0) aws-sdk-sqs (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ssm (1.73.0) aws-sdk-ssm (1.83.0)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.2) aws-sigv4 (1.2.1)
aws-eventstream (~> 1.0, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
azure_graph_rbac (0.17.1) azure_graph_rbac (0.17.2)
ms_rest_azure (~> 0.11.0) ms_rest_azure (~> 0.12.0)
azure_mgmt_key_vault (0.17.5) azure_mgmt_key_vault (0.17.6)
ms_rest_azure (~> 0.11.1) ms_rest_azure (~> 0.12.0)
azure_mgmt_resources (0.17.8) azure_mgmt_resources (0.17.9)
ms_rest_azure (~> 0.11.1) ms_rest_azure (~> 0.12.0)
azure_mgmt_security (0.18.0) azure_mgmt_security (0.18.2)
ms_rest_azure (~> 0.11.1) ms_rest_azure (~> 0.12.0)
azure_mgmt_storage (0.20.0) azure_mgmt_storage (0.21.1)
ms_rest_azure (~> 0.11.1) ms_rest_azure (~> 0.12.0)
bcrypt_pbkdf (1.0.1) bcrypt_pbkdf (1.0.1)
builder (3.2.4) builder (3.2.4)
chef-config (15.9.17) chef-config (16.2.50)
addressable addressable
chef-utils (= 15.9.17) chef-utils (= 16.2.50)
fuzzyurl fuzzyurl
mixlib-config (>= 2.2.12, < 4.0) mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0) mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2) tomlrb (~> 1.2)
chef-telemetry (1.0.3) chef-telemetry (1.0.8)
chef-config chef-config
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2) ffi-yajl (~> 2.2)
http (~> 2.2) chef-utils (16.2.50)
chef-utils (15.9.17) coderay (1.1.3)
coderay (1.1.2)
concurrent-ruby (1.1.6) concurrent-ruby (1.1.6)
declarative (0.0.10) declarative (0.0.10)
declarative-option (0.1.0) declarative-option (0.1.0)
diff-lcs (1.3) diff-lcs (1.4.2)
docker-api (1.34.2) docker-api (1.34.2)
excon (>= 0.47.0) excon (>= 0.47.0)
multi_json multi_json
@ -193,7 +198,7 @@ GEM
ed25519 (1.2.4) ed25519 (1.2.4)
equatable (0.6.1) equatable (0.6.1)
erubi (1.9.0) erubi (1.9.0)
excon (0.73.0) excon (0.75.0)
faraday (0.17.3) faraday (0.17.3)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6) faraday-cookie_jar (0.0.6)
@ -201,7 +206,7 @@ GEM
http-cookie (~> 1.0.0) http-cookie (~> 1.0.0)
faraday_middleware (0.12.2) faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
ffi (1.12.2) ffi (1.13.1)
ffi-yajl (2.3.3) ffi-yajl (2.3.3)
libyajl2 (~> 1.2) libyajl2 (~> 1.2)
fuzzyurl (0.9.0) fuzzyurl (0.9.0)
@ -224,30 +229,23 @@ GEM
ffi (>= 1.0.1) ffi (>= 1.0.1)
gyoku (1.3.1) gyoku (1.3.1)
builder (>= 2.1.2) builder (>= 2.1.2)
hana (1.3.5) hana (1.3.6)
hashie (3.6.0) hashie (3.6.0)
htmlentities (4.3.4) htmlentities (4.3.4)
http (2.2.2)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3) http-cookie (1.0.3)
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (1.0.3)
http_parser.rb (0.6.0)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.2) i18n (1.8.3)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
inifile (3.0.0) inifile (3.0.0)
inspec (4.18.104) inspec (4.20.10)
faraday_middleware (~> 0.12.2) faraday_middleware (~> 0.12.2)
inspec-core (= 4.18.104) inspec-core (= 4.20.10)
train (~> 3.0) train (~> 3.0)
train-aws (~> 0.1) train-aws (~> 0.1)
train-habitat (~> 0.1) train-habitat (~> 0.1)
train-winrm (~> 0.2) train-winrm (~> 0.2)
inspec-core (4.18.104) inspec-core (4.20.10)
addressable (~> 2.4) addressable (~> 2.4)
chef-telemetry (~> 1.0) chef-telemetry (~> 1.0)
faraday (>= 0.9.0) faraday (>= 0.9.0)
@ -255,12 +253,12 @@ GEM
htmlentities (~> 4.3) htmlentities (~> 4.3)
json_schemer (~> 0.2.1) json_schemer (~> 0.2.1)
license-acceptance (>= 0.2.13, < 2.0) license-acceptance (>= 0.2.13, < 2.0)
method_source (~> 0.8) method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0) mixlib-log (~> 3.0)
multipart-post (~> 2.0) multipart-post (~> 2.0)
parallel (~> 1.9) parallel (~> 1.9)
parslet (~> 1.5) parslet (~> 1.5)
pry (~> 0) pry (~> 0.13)
rspec (~> 3.9) rspec (~> 3.9)
rspec-its (~> 1.2) rspec-its (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2) rubyzip (~> 1.2, >= 1.2.2)
@ -268,7 +266,7 @@ GEM
sslshake (~> 1.2) sslshake (~> 1.2)
term-ansicolor (~> 1.7) term-ansicolor (~> 1.7)
thor (>= 0.20, < 2.0) thor (>= 0.20, < 2.0)
tomlrb (~> 1.2) tomlrb (~> 1.2.0)
train-core (~> 3.0) train-core (~> 3.0)
tty-prompt (~> 0.17) tty-prompt (~> 0.17)
tty-table (~> 0.10) tty-table (~> 0.10)
@ -282,9 +280,9 @@ GEM
jwt (2.2.1) jwt (2.2.1)
kitchen-docker (2.10.0) kitchen-docker (2.10.0)
test-kitchen (>= 1.0.0) test-kitchen (>= 1.0.0)
kitchen-inspec (1.3.2) kitchen-inspec (2.0.0)
hashie (~> 3.4) hashie (~> 3.4)
inspec (>= 1.47, < 5.0) inspec (>= 2.2.64, < 5.0)
test-kitchen (>= 1.6, < 3) test-kitchen (>= 1.6, < 3)
kitchen-salt (0.6.3) kitchen-salt (0.6.3)
hashie (>= 3.5) hashie (>= 3.5)
@ -300,9 +298,9 @@ GEM
little-plugger (~> 1.1) little-plugger (~> 1.1)
multi_json (~> 1.10) multi_json (~> 1.10)
memoist (0.16.2) memoist (0.16.2)
method_source (0.9.2) method_source (1.0.0)
mini_mime (1.0.2) mini_mime (1.0.2)
minitest (5.14.0) minitest (5.14.1)
mixlib-config (3.0.6) mixlib-config (3.0.6)
tomlrb tomlrb
mixlib-install (3.12.1) mixlib-install (3.12.1)
@ -316,32 +314,31 @@ GEM
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0) faraday (>= 0.9, < 2.0.0)
timeliness (~> 0.3.10) timeliness (~> 0.3.10)
ms_rest_azure (0.11.2) ms_rest_azure (0.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0) faraday (>= 0.9, < 2.0.0)
faraday-cookie_jar (~> 0.0.6) faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6) ms_rest (~> 0.7.6)
unf_ext (= 0.0.7.2)
multi_json (1.14.1) multi_json (1.14.1)
multipart-post (2.1.1) multipart-post (2.1.1)
necromancer (0.5.1) necromancer (0.5.1)
net-scp (2.0.0) net-scp (3.0.0)
net-ssh (>= 2.6.5, < 6.0.0) net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (5.2.0) net-ssh (6.1.0)
net-ssh-gateway (2.0.0) net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0) net-ssh (>= 4.0.0)
nori (2.6.0) nori (2.6.0)
os (1.1.0) os (1.1.0)
parallel (1.19.1) parallel (1.19.2)
parslet (1.8.2) parslet (1.8.2)
pastel (0.7.3) pastel (0.7.4)
equatable (~> 0.6) equatable (~> 0.6)
tty-color (~> 0.5) tty-color (~> 0.5)
pry (0.12.2) pry (0.13.1)
coderay (~> 1.1.0) coderay (~> 1.1)
method_source (~> 0.9.0) method_source (~> 1.0)
public_suffix (4.0.4) public_suffix (4.0.5)
regexp_parser (1.7.0) regexp_parser (1.7.1)
representable (3.0.4) representable (3.0.4)
declarative (< 0.1.0) declarative (< 0.1.0)
declarative-option (< 0.2.0) declarative-option (< 0.2.0)
@ -351,9 +348,9 @@ GEM
rspec-core (~> 3.9.0) rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0) rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.9.0)
rspec-core (3.9.1) rspec-core (3.9.2)
rspec-support (~> 3.9.1) rspec-support (~> 3.9.3)
rspec-expectations (3.9.1) rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.9.0)
rspec-its (1.3.0) rspec-its (1.3.0)
@ -362,7 +359,7 @@ GEM
rspec-mocks (3.9.1) rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.9.0)
rspec-support (3.9.2) rspec-support (3.9.3)
rubyntlm (0.6.2) rubyntlm (0.6.2)
rubyzip (1.3.0) rubyzip (1.3.0)
semverse (3.0.0) semverse (3.0.0)
@ -371,7 +368,7 @@ GEM
faraday (>= 0.17.3, < 2.0) faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0) jwt (>= 1.5, < 3.0)
multi_json (~> 1.10) multi_json (~> 1.10)
sslshake (1.3.0) sslshake (1.3.1)
strings (0.1.8) strings (0.1.8)
strings-ansi (~> 0.1) strings-ansi (~> 0.1)
unicode-display_width (~> 1.5) unicode-display_width (~> 1.5)
@ -380,27 +377,27 @@ GEM
sync (0.5.0) sync (0.5.0)
term-ansicolor (1.7.1) term-ansicolor (1.7.1)
tins (~> 1.0) tins (~> 1.0)
test-kitchen (2.4.0) test-kitchen (2.5.2)
bcrypt_pbkdf (~> 1.0) bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2) ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11) license-acceptance (~> 1.0, >= 1.0.11)
mixlib-install (~> 3.6) mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 4.0) mixlib-shellout (>= 1.2, < 4.0)
net-scp (>= 1.1, < 3.0) net-scp (>= 1.1, < 4.0)
net-ssh (>= 2.9, < 6.0) net-ssh (>= 2.9, < 7.0)
net-ssh-gateway (>= 1.2, < 3.0) net-ssh-gateway (>= 1.2, < 3.0)
thor (~> 0.19) thor (>= 0.19, < 2.0)
winrm (~> 2.0) winrm (~> 2.0)
winrm-elevated (~> 1.0) winrm-elevated (~> 1.0)
winrm-fs (~> 1.1) winrm-fs (~> 1.1)
thor (0.20.3) thor (1.0.1)
thread_safe (0.3.6) thread_safe (0.3.6)
timeliness (0.3.10) timeliness (0.3.10)
tins (1.24.1) tins (1.25.0)
sync sync
tomlrb (1.3.0) tomlrb (1.2.9)
train (3.2.28) train (3.3.4)
activesupport (~> 5.2.3) activesupport (>= 5.2.4.3, < 6.0.0)
azure_graph_rbac (~> 0.16) azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17) azure_mgmt_key_vault (~> 0.17)
azure_mgmt_resources (~> 0.15) azure_mgmt_resources (~> 0.15)
@ -410,15 +407,16 @@ GEM
google-api-client (>= 0.23.9, < 0.35.0) google-api-client (>= 0.23.9, < 0.35.0)
googleauth (>= 0.6.6, < 0.11.0) googleauth (>= 0.6.6, < 0.11.0)
inifile (~> 3.0) inifile (~> 3.0)
train-core (= 3.2.28) train-core (= 3.3.4)
train-winrm (~> 0.2) train-winrm (~> 0.2)
train-aws (0.1.15) train-aws (0.1.17)
aws-sdk-apigateway (~> 1.0) aws-sdk-apigateway (~> 1.0)
aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0)
aws-sdk-athena (~> 1.0) aws-sdk-athena (~> 1.0)
aws-sdk-autoscaling (~> 1.22.0) aws-sdk-autoscaling (~> 1.22.0)
aws-sdk-budgets (~> 1.0) aws-sdk-budgets (~> 1.0)
aws-sdk-cloudformation (~> 1.0) aws-sdk-cloudformation (~> 1.0)
aws-sdk-cloudfront (~> 1.0)
aws-sdk-cloudhsm (~> 1.0) aws-sdk-cloudhsm (~> 1.0)
aws-sdk-cloudhsmv2 (~> 1.0) aws-sdk-cloudhsmv2 (~> 1.0)
aws-sdk-cloudtrail (~> 1.8) aws-sdk-cloudtrail (~> 1.8)
@ -434,6 +432,7 @@ GEM
aws-sdk-ec2 (~> 1.70) aws-sdk-ec2 (~> 1.70)
aws-sdk-ecr (~> 1.18) aws-sdk-ecr (~> 1.18)
aws-sdk-ecs (~> 1.30) aws-sdk-ecs (~> 1.30)
aws-sdk-efs (~> 1.0)
aws-sdk-eks (~> 1.9) aws-sdk-eks (~> 1.9)
aws-sdk-elasticache (~> 1.0) aws-sdk-elasticache (~> 1.0)
aws-sdk-elasticbeanstalk (~> 1.0) aws-sdk-elasticbeanstalk (~> 1.0)
@ -459,12 +458,13 @@ GEM
aws-sdk-sns (~> 1.9) aws-sdk-sns (~> 1.9)
aws-sdk-sqs (~> 1.10) aws-sdk-sqs (~> 1.10)
aws-sdk-ssm (~> 1.0) aws-sdk-ssm (~> 1.0)
train-core (3.2.28) train-core (3.3.4)
addressable (~> 2.5) addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0) json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0) mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0) net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 6.0) net-ssh (>= 2.9, < 7.0)
train-habitat (0.2.13) train-habitat (0.2.13)
train-winrm (0.2.6) train-winrm (0.2.6)
winrm (~> 2.0) winrm (~> 2.0)
@ -483,7 +483,7 @@ GEM
tty-cursor (~> 0.7) tty-cursor (~> 0.7)
tty-screen (~> 0.7) tty-screen (~> 0.7)
wisper (~> 2.0.0) wisper (~> 2.0.0)
tty-screen (0.7.1) tty-screen (0.8.0)
tty-table (0.11.0) tty-table (0.11.0)
equatable (~> 0.6) equatable (~> 0.6)
necromancer (~> 0.5) necromancer (~> 0.5)
@ -495,7 +495,7 @@ GEM
uber (0.1.0) uber (0.1.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.2) unf_ext (0.0.7.7)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
uri_template (0.7.0) uri_template (0.7.0)

View File

@ -14,16 +14,16 @@ platforms:
## SALT `master` ## SALT `master`
- name: debian-10-master-py3 - name: debian-10-master-py3
driver: driver:
image: netmanagers/salt-master-py3:debian-10 image: saltimages/salt-master-py3:debian-10
- name: ubuntu-1804-master-py3 - name: ubuntu-1804-master-py3
driver: driver:
image: netmanagers/salt-master-py3:ubuntu-18.04 image: saltimages/salt-master-py3:ubuntu-18.04
- name: centos-8-master-py3 - name: centos-8-master-py3
driver: driver:
image: netmanagers/salt-master-py3:centos-8 image: saltimages/salt-master-py3:centos-8
- name: fedora-31-master-py3 - name: fedora-31-master-py3
driver: driver:
image: netmanagers/salt-master-py3:fedora-31 image: saltimages/salt-master-py3:fedora-31
- name: opensuse-leap-151-master-py3 - name: opensuse-leap-151-master-py3
driver: driver:
image: netmanagers/salt-master-py3:opensuse-leap-15.1 image: netmanagers/salt-master-py3:opensuse-leap-15.1
@ -34,71 +34,24 @@ platforms:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: amazonlinux-2-master-py3 - name: amazonlinux-2-master-py3
driver: driver:
image: netmanagers/salt-master-py3:amazonlinux-2 image: saltimages/salt-master-py3:amazonlinux-2
## SALT `3000.2`
- name: debian-10-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:debian-10
- name: debian-9-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:debian-9
- name: ubuntu-1804-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:ubuntu-18.04
- name: centos-8-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:centos-8
- name: centos-7-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:centos-7
- name: fedora-31-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:fedora-31
- name: opensuse-leap-151-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:opensuse-leap-15.1
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: amazonlinux-2-3000-2-py3
driver:
image: netmanagers/salt-3000.2-py3:amazonlinux-2
- name: ubuntu-1804-3000-2-py2
driver:
image: netmanagers/salt-3000.2-py2:ubuntu-18.04
- name: ubuntu-1604-3000-2-py2
driver:
image: netmanagers/salt-3000.2-py2:ubuntu-16.04
- name: arch-base-latest-3000-2-py2
driver:
image: netmanagers/salt-3000.2-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd
## SALT `2019.2` ## SALT `2019.2`
- name: debian-10-2019-2-py3 - name: debian-10-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:debian-10 image: saltimages/salt-2019.2-py3:debian-10
- name: debian-9-2019-2-py3 - name: debian-9-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:debian-9 image: saltimages/salt-2019.2-py3:debian-9
- name: ubuntu-1804-2019-2-py3 - name: ubuntu-1804-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:ubuntu-18.04 image: saltimages/salt-2019.2-py3:ubuntu-18.04
- name: ubuntu-1604-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:ubuntu-16.04
- name: centos-8-2019-2-py3 - name: centos-8-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:centos-8 image: saltimages/salt-2019.2-py3:centos-8
- name: centos-7-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:centos-7
- name: fedora-31-2019-2-py3 - name: fedora-31-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:fedora-31 image: saltimages/salt-2019.2-py3:fedora-31
- name: opensuse-leap-151-2019-2-py3 - name: opensuse-leap-151-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1 image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
@ -107,20 +60,76 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: centos-7-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:centos-7
- name: amazonlinux-2-2019-2-py3 - name: amazonlinux-2-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:amazonlinux-2 image: saltimages/salt-2019.2-py3:amazonlinux-2
- name: centos-6-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:centos-6
run_command: /sbin/init
- name: amazonlinux-1-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:amazonlinux-1
run_command: /sbin/init
- name: arch-base-latest-2019-2-py2 - name: arch-base-latest-2019-2-py2
driver: driver:
image: netmanagers/salt-2019.2-py2:arch-base-latest image: saltimages/salt-2019.2-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd
## SALT `2018.3`
- name: fedora-30-2018-3-py3
driver:
image: netmanagers/salt-2018.3-py3:fedora-30
- name: debian-9-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:debian-9
- name: ubuntu-1604-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
- name: centos-7-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:centos-7
- name: opensuse-leap-151-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: amazonlinux-1-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:amazonlinux-1
run_command: /sbin/init
- name: arch-base-latest-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd
## SALT `2017.7`
- name: debian-8-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:debian-8
- name: ubuntu-1604-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
- name: centos-6-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:centos-6
run_command: /sbin/init
- name: fedora-30-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:fedora-30
- name: opensuse-leap-151-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: amazonlinux-1-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:amazonlinux-1
run_command: /sbin/init
- name: arch-base-latest-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
provisioner: provisioner: