From 762a76cfb445ce251b24fa8077d6cb85e304ed03 Mon Sep 17 00:00:00 2001 From: lnemsick-simp Date: Wed, 7 Nov 2018 11:04:40 -0500 Subject: [PATCH] (SIMP-5585) Update static assets (#31) - Update static assets - Update contribution guide URL in README.rst - Work around non-idempotency of rsyslog module in acceptance tests SIMP-5585 #comment pupmod-simp-simp_logstash --- .gitlab-ci.yml | 452 ++++++++---------- .ruby-version | 2 +- .travis.yml | 65 ++- CHANGELOG | 3 + Gemfile | 15 +- README.rst | 29 +- spec/acceptance/nodesets/backup.yml | 55 --- .../suites/default/01_client_server_spec.rb | 3 + 8 files changed, 284 insertions(+), 340 deletions(-) delete mode 100644 spec/acceptance/nodesets/backup.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61e2264..aed7d64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,52 +1,61 @@ # The testing matrix considers ruby/puppet versions supported by SIMP and PE: # -# https://puppet.com/docs/pe/2017.3/overview/component_versions_in_recent_pe_releases.html +# https://puppet.com/docs/pe/2018.1/component_versions_in_recent_pe_releases.html # https://puppet.com/misc/puppet-enterprise-lifecycle -# https://puppet.com/docs/pe/2017.3/overview/getting_support_for_pe.html#standard-releases-and-long-term-support-releases +# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html # ------------------------------------------------------------------------------ -# release pup ruby eol -# PE 2016.4 4.7 2.1.9 2018-10 (LTS) -# SIMP6.0.0 4.8 2.1.9 TBD -# PE 2017.2 4.10 2.1.9 2018-02-21 -# PE 2017.3 5.3 2.4.1 2018-07 -# PE 2018.1 ??? ????? ????-?? (LTS) +# Release Puppet Ruby EOL +# SIMP 6.1 4.10.6 2.1.9 TBD +# SIMP 6.2 4.10.12 2.1.9 TBD +# PE 2016.4.15 4.10.12 2.1.9 2018-12 (LTS) +# PE 2017.3.10 5.3.8 2.4.4 2018-12 (STS) +# SIMP 6.3 5.5.7 2.4.4 TBD*** +# PE 2018.1 5.5.6 2.4.4 2020-05 (LTS)*** +# +# *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5 --- -.cache_bundler: &cache_bundler +stages: + - 'sanity' + - 'validation' + - 'acceptance' + - 'compliance' + - 'deployment' + +image: 'ruby:2.4' + +variables: + PUPPET_VERSION: 'UNDEFINED' # <- Matrixed jobs MUST override this (or fail) + BUNDLER_VERSION: '1.16.1' + + # Force dependencies into a path the gitlab-runner user can write to. + # (This avoids some failures on Runners with misconfigured ruby environments.) + GEM_HOME: .vendor/gem_install + BUNDLE_CACHE_PATH: .vendor/bundle + BUNDLE_PATH: .vendor/bundle + BUNDLE_BIN: .vendor/gem_install/bin + BUNDLE_NO_PRUNE: 'true' + + +# bundler dependencies and caching +# +# - Cache bundler gems between pipelines foreach Ruby version +# - Try to use cached and local resources before downloading dependencies +# -------------------------------------- +.setup_bundler_env: &setup_bundler_env cache: untracked: true - # A broad attempt at caching between runs (ala Travis CI) - key: "${CI_PROJECT_NAMESPACE}__bundler" + key: "${CI_PROJECT_NAMESPACE}_ruby-${MATRIX_RUBY_VERSION}_bundler" paths: - '.vendor' - - 'vendor' - -.setup_bundler_env: &setup_bundler_env before_script: - - 'echo Files in cache: $(find .vendor | wc -l) || :' - - 'export GEM_HOME=.vendor/gem_install' - - 'export BUNDLE_CACHE_PATH=.vendor/bundler' - - 'declare GEM_BUNDLER_VER=(-v ''~> ${BUNDLER_VERSION:-1.16.0}'')' - - declare GEM_INSTALL=(gem install --no-document) - - declare BUNDLER_INSTALL=(bundle install --no-binstubs --jobs $(nproc) --path=.vendor "${FLAGS[@]}") - - gem list -ie "${GEM_BUNDLE_VER[@]}" --silent bundler || "${GEM_INSTALL[@]}" --local "${GEM_BUNDLE_VER[@]}" bundler || "${GEM_INSTALL[@]}" "${GEM_BUNDLE_VER[@]}" bundler + - 'ruby -e "puts %(Environment Variables:\n * #{ENV.keys.grep(/PUPPET|SIMP|BEAKER|MATRIX/).map{|v| %(#{v} = #{ENV[v]})}.join(%(\n * ))})"' + - 'declare GEM_BUNDLER_VER=(-v "~> ${BUNDLER_VERSION:-1.16.0}")' + - 'declare GEM_INSTALL_CMD=(gem install --no-document)' + - 'declare BUNDLER_INSTALL_CMD=(bundle install --no-binstubs --jobs $(nproc) "${FLAGS[@]}")' + - 'mkdir -p ${GEM_HOME} ${BUNDLER_BIN}' + - 'gem list -ie "${GEM_BUNDLER_VER[@]}" --silent bundler || "${GEM_INSTALL_CMD[@]}" --local "${GEM_BUNDLER_VER[@]}" bundler || "${GEM_INSTALL_CMD[@]}" "${GEM_BUNDLER_VER[@]}" bundler' - 'rm -rf pkg/ || :' - - bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL[@]}" --local || "${BUNDLER_INSTALL[@]}") - - -.validation_checks: &validation_checks - script: - - bundle exec rake syntax - - bundle exec rake check:dot_underscore - - bundle exec rake check:test_file - - bundle exec rake pkg:check_version - - bundle exec rake pkg:compare_latest_tag - - bundle exec rake lint - - bundle exec rake clean - - bundle exec puppet module build - -.spec_tests: &spec_tests - script: - - bundle exec rake spec + - 'bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL_CMD[@]}" --local || "${BUNDLER_INSTALL_CMD[@]}" || bundle pristine || "${BUNDLER_INSTALL_CMD[@]}") || echo "PIPELINE: Bundler could not find everything"' # To avoid running a prohibitive number of tests every commit, # don't set this env var in your gitlab instance @@ -55,243 +64,202 @@ variables: - $SIMP_FULL_MATRIX -stages: - - validation - - unit - - acceptance - - deploy +# Puppet Versions +#----------------------------------------------------------------------- -# Puppet 4.7 for PE 2016.4 LTS Support (EOL: 2018-10-21) -# See: https://puppet.com/misc/puppet-enterprise-lifecycle -# -------------------------------------- -pup4_7-validation: - stage: validation - tags: - - docker - image: ruby:2.1 +.pup_4: &pup_4 + image: 'ruby:2.4' variables: - PUPPET_VERSION: '~> 4.7.0' - <<: *cache_bundler - <<: *setup_bundler_env - <<: *validation_checks + PUPPET_VERSION: '~> 4.0' + MATRIX_RUBY_VERSION: '2.1' -pup4_7-unit: - stage: unit - tags: - - docker - image: ruby:2.1 +.pup_4_10: &pup_4_10 + image: 'ruby:2.1' variables: - PUPPET_VERSION: '~> 4.7.0' - <<: *cache_bundler - <<: *setup_bundler_env - <<: *spec_tests + PUPPET_VERSION: '~> 4.10.4' + MATRIX_RUBY_VERSION: '2.1' +.pup_5: &pup_5 + image: 'ruby:2.4' + variables: + PUPPET_VERSION: '~> 5.0' + BEAKER_PUPPET_COLLECTION: 'puppet5' + MATRIX_RUBY_VERSION: '2.4' -# Puppet 4.8 for SIMP 6.0 + 6.1 support -# -------------------------------------- -pup4_8-validation: - stage: validation - tags: - - docker - image: ruby:2.1 +.pup_5_3: &pup_5_3 + image: 'ruby:2.4' variables: - PUPPET_VERSION: '~> 4.8.0' - <<: *cache_bundler - <<: *setup_bundler_env - <<: *validation_checks + PUPPET_VERSION: '~> 5.3.0' + BEAKER_PUPPET_COLLECTION: 'puppet5' + MATRIX_RUBY_VERSION: '2.4' -pup4_8-unit: - stage: unit - tags: - - docker - image: ruby:2.1 +# Puppet for SIMP 6.3, PE is at 5.5.6 but close enough +.pup_5_5_7: &pup_5_5_7 + image: 'ruby:2.4' variables: - PUPPET_VERSION: '~> 4.8.0' - <<: *cache_bundler - <<: *setup_bundler_env - <<: *spec_tests + PUPPET_VERSION: '5.5.7' + BEAKER_PUPPET_COLLECTION: 'puppet5' + MATRIX_RUBY_VERSION: '2.4' +# Experimental +#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -# Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21) -# See: https://puppet.com/misc/puppet-enterprise-lifecycle -# -------------------------------------- -pup4_10-validation: - stage: validation - tags: - - docker - image: ruby:2.1 +.pup_6: &pup_6 + allow_failure: true + image: 'ruby:2.4' variables: - PUPPET_VERSION: '~> 4.10.0' - <<: *cache_bundler - <<: *setup_bundler_env - <<: *validation_checks + PUPPET_VERSION: '~> 6.0' + BEAKER_PUPPET_COLLECTION: 'puppet6' + MATRIX_RUBY_VERSION: '2.4' -pup4_10-unit: - stage: unit - tags: - - docker - image: ruby:2.1 - variables: - PUPPET_VERSION: '~> 4.10.0' - <<: *cache_bundler +# Testing Environments +#----------------------------------------------------------------------- + +.lint_tests: &lint_tests + stage: 'validation' + tags: ['docker'] <<: *setup_bundler_env - <<: *spec_tests + script: + - 'bundle exec rake syntax' + - 'bundle exec rake lint' + - 'bundle exec rake metadata_lint' +.unit_tests: &unit_tests + stage: 'validation' + tags: ['docker'] + <<: *setup_bundler_env + script: + - 'bundle exec rake spec' -# Puppet 5.3 for PE 2017.3 support (EOL: 2018-07) -# See: https://puppet.com/misc/puppet-enterprise-lifecycle -# -------------------------------------- -pup5_3-validation: - stage: validation - tags: - - docker - image: ruby:2.4 - variables: - PUPPET_VERSION: '~> 5.3.0' - <<: *cache_bundler +.acceptance_tests: &acceptance_tests + stage: 'acceptance' + tags: ['beaker'] <<: *setup_bundler_env - <<: *validation_checks -pup5_3-unit: - stage: unit - tags: - - docker - image: ruby:2.4 - variables: - PUPPET_VERSION: '~> 5.3.0' - <<: *cache_bundler +.compliance_tests: &compliance_tests + stage: 'compliance' + tags: ['beaker'] <<: *setup_bundler_env - <<: *spec_tests -# Keep an eye on the latest puppet 5 -# ---------------------------------- -pup5_latest-validation: - stage: validation - tags: - - docker - image: ruby:2.4 - variables: - PUPPET_VERSION: '~> 5.0' - <<: *cache_bundler - <<: *setup_bundler_env - <<: *validation_checks +# Pipeline / testing matrix +#======================================================================= -pup5_latest-unit: - stage: unit - tags: - - docker - image: ruby:2.4 - variables: - PUPPET_VERSION: '~> 5.0' - <<: *cache_bundler +sanity_checks: + <<: *pup_5 <<: *setup_bundler_env - <<: *spec_tests + stage: 'sanity' + tags: ['docker'] + script: + - 'if `hash apt-get`; then apt-get update; fi' + - 'if `hash apt-get`; then apt-get install -y rpm; fi' + - 'bundle exec rake check:dot_underscore' + - 'bundle exec rake check:test_file' + - 'bundle exec rake pkg:check_version' + - 'bundle exec rake pkg:compare_latest_tag' + - 'bundle exec rake pkg:create_tag_changelog' + - 'bundle exec puppet module build' +# Linting +#----------------------------------------------------------------------- +pup4-lint: + <<: *pup_4_10 + <<: *lint_tests -# Acceptance tests -# ============================================================================== -default: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - variables: - PUPPET_VERSION: '~> 4.10.0' +pup5-lint: + <<: *pup_5 + <<: *lint_tests + +pup6-lint: + <<: *pup_6 + <<: *lint_tests + +# Unit Tests +#----------------------------------------------------------------------- + +pup4.10-unit: + <<: *pup_4_10 + <<: *unit_tests + +pup5-unit: + <<: *pup_5 + <<: *unit_tests + +pup5_3-unit: + <<: *pup_5_3 + <<: *unit_tests + +pup5.5.7-unit: + <<: *pup_5_5_7 + <<: *unit_tests + +pup6-unit: + <<: *pup_6 + <<: *unit_tests + +# Acceptance Tests +#----------------------------------------------------------------------- + +pup4.10: + <<: *pup_4_10 + <<: *acceptance_tests script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[default] - -default-oel: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env + - 'bundle exec rake beaker:suites[default]' + +pup4.10-fips: + <<: *pup_4_10 + <<: *acceptance_tests <<: *only_with_SIMP_FULL_MATRIX - variables: - PUPPET_VERSION: '4.10' script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[default,oel] - -default-puppet5: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - variables: - PUPPET_VERSION: '~> 5.3' - BEAKER_PUPPET_COLLECTION: 'puppet5' + - 'BEAKER_fips=yes bundle exec rake beaker:suites[default]' + +pup5.5.7: + <<: *pup_5_5_7 + <<: *acceptance_tests script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[default] - -default-fips: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - <<: *only_with_SIMP_FULL_MATRIX - variables: - PUPPET_VERSION: '~> 4.10.0' - BEAKER_fips: 'yes' + - 'bundle exec rake beaker:suites[default]' + +pup5.5.7-fips: + <<: *pup_5_5_7 + <<: *acceptance_tests script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[default] - -elasticsearch: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - variables: - PUPPET_VERSION: '~> 4.10.0' + - 'BEAKER_fips=yes bundle exec rake beaker:suites[default]' + +pup5.5.7-oel: + <<: *pup_5_5_7 + <<: *acceptance_tests script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[elasticsearch] - -elasticsearch-oel: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - <<: *only_with_SIMP_FULL_MATRIX - variables: - PUPPET_VERSION: '4.10' + - 'bundle exec rake beaker:suites[default,oel]' + +pup4.10-elastic: + <<: *pup_4_10 + <<: *acceptance_tests script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[elasticsearch,oel] - -elasticsearch-puppet5: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - variables: - PUPPET_VERSION: '~> 5.3' - BEAKER_PUPPET_COLLECTION: 'puppet5' + - 'bundle exec rake beaker:suites[elasticsearch]' + +pup4.10-elastic-fips: + <<: *pup_4_10 + <<: *acceptance_tests + <<: *only_with_SIMP_FULL_MATRIX script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[elasticsearch] - -elasticsearch-fips: - stage: acceptance - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env + - 'BEAKER_fips=yes bundle exec rake beaker:suites[elasticsearch]' + +pup5.5.7-elastic: + <<: *pup_5_5_7 + <<: *acceptance_tests <<: *only_with_SIMP_FULL_MATRIX - variables: - PUPPET_VERSION: '~> 4.10.0' - BEAKER_fips: 'yes' script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[elasticsearch] + - 'bundle exec rake beaker:suites[elasticsearch]' + +pup5.5.7-elastic-fips: + <<: *pup_5_5_7 + <<: *acceptance_tests + script: + - 'BEAKER_fips=yes bundle exec rake beaker:suites[elasticsearch]' + +pup5.5.7-oel-elastic: + <<: *pup_5_5_7 + <<: *acceptance_tests + script: + - 'bundle exec rake beaker:suites[elasticsearch,oel]' diff --git a/.ruby-version b/.ruby-version index b88e500..79a6144 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.9 \ No newline at end of file +2.4.4 diff --git a/.travis.yml b/.travis.yml index e55dde2..57bd579 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,31 @@ # The testing matrix considers ruby/puppet versions supported by SIMP and PE: +# +# https://puppet.com/docs/pe/2018.1/component_versions_in_recent_pe_releases.html +# https://puppet.com/misc/puppet-enterprise-lifecycle +# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html # ------------------------------------------------------------------------------ -# release pup ruby eol -# PE 2016.4 4.7 2.1.9 TBD (LTS) -# PE 2016.5 4.8 2.1.9 2017-10-31 -# SIMP6.0.0 4.8 2.1.9 TBD -# PE 2017.1 4.9 2.1.9 2017-10-31 -# PE 2017.2 4.10 2.1.9 TBD +# Release Puppet Ruby EOL +# SIMP 6.2 4.10 2.1.9 TBD +# PE 2016.4 4.10 2.1.9 2018-12-31 (LTS) +# PE 2017.3 5.3 2.4.4 2018-12-31 +# SIMP 6.3 5.5 2.4.4 TBD*** +# PE 2018.1 5.5 2.4.4 2020-05 (LTS)*** +# PE 2019.0 6.0 2.5.1 2019-08-31^^^ +# +# *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5 +# ^^^ = SIMP doesn't support 6 yet; tests are info-only and allowed to fail + --- language: ruby cache: bundler sudo: false +stages: + - check + - spec + - name: deploy + if: 'fork = false AND tag = true' + bundler_args: --without development system_tests --path .vendor notifications: @@ -24,14 +39,17 @@ addons: before_install: - rm -f Gemfile.lock +global: + - STRICT_VARIABLES=yes + jobs: allow_failures: - - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 5.0" + - name: 'Latest Puppet 6.x (allowed to fail)' include: - stage: check - rvm: 2.4.1 - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 5" + rvm: 2.4.4 + env: PUPPET_VERSION="~> 5.5" script: - bundle exec rake check:dot_underscore - bundle exec rake check:test_file @@ -41,33 +59,43 @@ jobs: - bundle exec rake pkg:create_tag_changelog - bundle exec rake lint - bundle exec puppet module build + - stage: spec + name: 'Puppet 4.10 (SIMP 6.2, PE 2016.4)' + rvm: 2.1.9 + env: PUPPET_VERSION="~> 4.10.0" + script: + - bundle exec rake spec - stage: spec - rvm: 2.4.1 - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 5.0" + name: 'Puppet 5.3 (PE 2017.3)' + rvm: 2.4.4 + env: PUPPET_VERSION="~> 5.3.0" script: - bundle exec rake spec - stage: spec - rvm: 2.1.9 - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.10.0" + rvm: 2.4.4 + name: 'Puppet 5.5 (SIMP 6.3, PE 2018.1)' + env: PUPPET_VERSION="~> 5.5.0" script: - bundle exec rake spec - stage: spec - rvm: 2.1.9 - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.9.2" + name: 'Latest Puppet 5.x' + rvm: 2.4.4 + env: PUPPET_VERSION="~> 5.0" script: - bundle exec rake spec - stage: spec - rvm: 2.1.9 - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.7.0" + name: 'Latest Puppet 6.x (allowed to fail)' + rvm: 2.5.1 + env: PUPPET_VERSION="~>6.0" script: - bundle exec rake spec - stage: deploy - rvm: 2.4.1 + rvm: 2.4.4 script: - true before_deploy: @@ -87,5 +115,4 @@ jobs: secure: "FKZXbcuKXf5zF2vTxBIh9Dog2pPlC69vZOJIT4Ph1uvmHvRKs/zJf0lbRDBVi4rTCFywwGs1lHrvf+dCda4vO4ZR7m9l65UXNmhkC2FI3SbJT6EG+pBmflJqYvUlITylesI6Z5ymZ8Y7bucGTBtGDv1Sv39CKY6RXsPHsiORuIe5WdGOqsbAqCZq6hGTjl+M+v9YHLFSRUkib6H3rOQiqiU4nC3WBxvMNmgiJ/GVPXk+bPG0AP4gZTdDAN/JjXar6uB3G+NrBFeeEf4vN1IOY1PEpgag9cnhyrx9EWFkUZT+jHjR+o0U6XxROktxkAij3BykqEUn1E5nfG+7zWrW5WmcyRsAKgAg7l51ho7P9+DQKFen9PB++a6PEQ7dwNbB0wr/hUTmQdj5YKB7/+v0gxlbrWQGQJuFaRVGnBwQzYg2h4a8I2LVbpbKMZ8eZavbUuLpi5lhugFKrbjIY2XJPrZevB2Fg5gThkjPk0WElb44jPnFZD+f50Y7J6Y6EEM+BOQrckizRQr02Ex+Atn45tigE+rPDZd6U2C7AsYjqoHlgS06du6A13SSKqVpiOgF8spJAl8Q7R98EzO9QjN3j8r5LiVhUqa3RK4d84vyS2MjFlugc3jtYTcV+57WAmw5C+N75oVa48md0xYrQo5xEQ017oGmfAgKCiqqM3i0SKk=" on: tags: true - rvm: 2.4.1 condition: '($SKIP_FORGE_PUBLISH != true)' diff --git a/CHANGELOG b/CHANGELOG index 3c3dbdc..deda56c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Mon Nov 05 2018 Liz Nemsick - 5.0.2-0 +- Update contribution guide URL in README.rst + * Tue Sep 11 2018 Nicholas Markowski - 5.0.2-0 - Updated $app_pki_external_source to accept any string. This matches the functionality of pki::copy. diff --git a/Gemfile b/Gemfile index d22b231..dec16da 100644 --- a/Gemfile +++ b/Gemfile @@ -1,23 +1,20 @@ -# ------------------------------------------------------------------------------ -# NOTE: SIMP Puppet rake tasks support ruby 2.1.9 -# ------------------------------------------------------------------------------ gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/) gem_sources.each { |gem_source| source gem_source } group :test do gem 'rake' - gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 4.0') + gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 5.5') gem 'rspec' - gem 'rspec-puppet', ['>= 2.6.11', '< 3.0.0'] + gem 'rspec-puppet' gem 'hiera-puppet-helper' - gem 'puppetlabs_spec_helper', '~> 2.7.0' + gem 'puppetlabs_spec_helper' gem 'metadata-json-lint' gem 'puppet-strings' gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false - gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.1.0') - gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.2', '< 6.0']) + gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.2.0') + gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 5.6') gem 'facterdb' end @@ -29,5 +26,5 @@ end group :system_tests do gem 'beaker' gem 'beaker-rspec' - gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.10.0') + gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.12.0') end diff --git a/README.rst b/README.rst index 173152d..1b7c75f 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -|License| |Build Status| |SIMP compatibility| +|License| |CII Best Practices| |Puppet Forge| |Puppet Forge Downloads| |Build Status| SIMP Logstash Puppet Component Module ===================================== @@ -32,17 +32,14 @@ A module to integrate the `upstream logstash module `__, a -compliance oriented framework built on Puppet. +This module is a component of the +`System Integrity Management Platform `__, a +a compliance-management framework built on Puppet. If you find any issues, they can be submitted to our `JIRA `__. -Please read our `Contribution -Guide `__ -and visit our `developer -wiki `__. +Please read our `Contribution Guide `__. As a component module, this module is not recommended for use outside of a SIMP environment but may work with some minor modification. @@ -242,7 +239,7 @@ This module has only been tested on Red Hat Enterprise Linux 6 and 7 and CentOS Development ----------- -Please see the `SIMP Contribution Guidelines `__. +Please read our `Contribution Guide `__. Acceptance tests ^^^^^^^^^^^^^^^^ @@ -277,9 +274,13 @@ Some environment variables may be useful: tests to run on isolated networks. .. _SIMP IPSec Module: https://github.com/simp/pupmod-simp-libreswan -.. |License| image:: http://img.shields.io/:license-apache-blue.svg - :target: http://www.apache.org/licenses/LICENSE-2.0.html +.. |License| image:: http://img.shields.io/license-apache-blue.svg + :target: http://www.apache.org/licenses/LICENSE-2.0.html +.. |CII Best Practices| image:: https://bestpractices.coreinfrastructure.org/projects/73/badge + :target: https://bestpractices.coreinfrastructure.org/projects/73 +.. |Puppet Forge| image:: https://img.shields.io/puppetforge/v/simp/simp_logstash.svg + :target: https://forge.puppetlabs.com/simp/simp_logstash +.. |Puppet Forge Downloads| image:: https://img.shields.io/puppetforge/dt/simp/simp_logstash.svg + :target: https://forge.puppetlabs.com/simp/simp_logstash .. |Build Status| image:: https://travis-ci.org/simp/pupmod-simp-simp_logstash.svg - :target: https://travis-ci.org/simp/pupmod-simp-simp_logstash -.. |SIMP compatibility| image:: https://img.shields.io/badge/SIMP%20compatibility-4.2.*%2F5.1.*-orange.svg - :target: https://img.shields.io/badge/SIMP%20compatibility-4.2.*%2F5.1.*-orange.svg + :target: https://travis-ci.org/simp/pupmod-simp-simp_logstash diff --git a/spec/acceptance/nodesets/backup.yml b/spec/acceptance/nodesets/backup.yml deleted file mode 100644 index 13df840..0000000 --- a/spec/acceptance/nodesets/backup.yml +++ /dev/null @@ -1,55 +0,0 @@ -HOSTS: - el7-server: - roles: - - server - - default - - master - - simp_server - - nfs_server - - el7 - platform: el-7-x86_64 - box: puppetlabs/centos-7.0-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm - hypervisor: vagrant - vagrant_memsize: 2048 - simp_update_url : https://dl.bintray.com/simp/5.1.X - - el7-client: - roles: - - client - - agent - - el7 - platform: el-7-x86_64 - box: puppetlabs/centos-7.0-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm - hypervisor: vagrant - simp_update_url : https://dl.bintray.com/simp/5.1.X - - el6-server: - roles: - - simp_server - - nfs_server - - el6 - platform: el-6-x86_64 - box: puppetlabs/centos-6.6-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-nocm - hypervisor: vagrant - vagrant_memsize: 2048 - simp_update_url : https://dl.bintray.com/simp/4.2.X - - el6-client: - roles: - - client - - agent - - el6 - platform: el-6-x86_64 - box: puppetlabs/centos-6.6-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-nocm - hypervisor: vagrant - simp_update_url : https://dl.bintray.com/simp/4.2.X - -CONFIG: - log_level: verbose - type: foss - vagrant_memsize: 256 - # vb_gui: true diff --git a/spec/acceptance/suites/default/01_client_server_spec.rb b/spec/acceptance/suites/default/01_client_server_spec.rb index 1219490..8c06735 100644 --- a/spec/acceptance/suites/default/01_client_server_spec.rb +++ b/spec/acceptance/suites/default/01_client_server_spec.rb @@ -27,6 +27,9 @@ class { 'rsyslog': context "client #{client}-> server #{server} without TLS" do it 'should configure client without errors' do apply_manifest_on(client, client_manifest, :catch_failures => true) + + # rsyslog is not idempotent on el6 + apply_manifest_on(client, client_manifest, :catch_failures => true) end it 'should configure client idempotently' do