From 87ca15716abd6e9ff444d46b654f484d5562746c Mon Sep 17 00:00:00 2001 From: op-ct Date: Tue, 6 Jun 2017 14:34:42 -0400 Subject: [PATCH] (SIMP-3164) Update static assets (#20) This commit normalizes static assets with other SIMP Puppet modules. In particular, Travis CI is configured to include Puppet 4.10. SIMP-3164 #comment Updated simp-acpid --- .fixtures.yml.local | 5 ----- .gitignore | 1 + .puppet-lint.rc | 7 +++++-- .ruby-version | 1 + .travis.yml | 43 ++++++++++++++++++------------------------- Gemfile | 18 +++++++----------- Rakefile | 2 +- metadata.json | 6 ++++++ 8 files changed, 39 insertions(+), 44 deletions(-) delete mode 100644 .fixtures.yml.local create mode 100644 .ruby-version diff --git a/.fixtures.yml.local b/.fixtures.yml.local deleted file mode 100644 index 6059534fa..000000000 --- a/.fixtures.yml.local +++ /dev/null @@ -1,5 +0,0 @@ ---- - fixtures: - symlinks: - acpid: "#{source_dir}" - simp: "#{source_dir}/../simp" diff --git a/.gitignore b/.gitignore index 5bf726d2c..0de98a0a8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ dist /vendor /junit /log +/doc diff --git a/.puppet-lint.rc b/.puppet-lint.rc index 5b1e7c583..2415788d0 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,6 +1,9 @@ --log-format="%{path}:%{line}:%{check}:%{KIND}:%{message}" --relative --no-class_inherits_from_params_class-check ---no-80chars-check +--no-140chars-check +--no-empty_string-check --no-trailing_comma-check ---no-empty_string_assignment-check +# This is here because the code can't handle lookups in parameters and we have +# a LOT of those +--no-parameter_order-check diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..b88e5006f --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.1.9 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index ed54b7916..4cf93fbca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,40 +1,33 @@ -# PE/SIMP versions -# app pup ruby -# 2015.2 4.3 2.1.7 -# 2015.3 4.3 2.1.8 -# 2016.1 4.4 2.1.9 -# 2016.2 4.5 2.1.9 -# S6.0.0 4.7 2.1.9 +# The testing matrix considers ruby/puppet versions supported by SIMP and PE: +# ------------------------------------------------------------------------------ +# 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 --- language: ruby sudo: false cache: bundler before_script: - - bundle -bundler_args: --without development system_tests +- bundle update +bundler_args: "--without development system_tests" before_install: rm Gemfile.lock || true script: - - bundle exec rake test +- bundle exec rake test notifications: email: false rvm: - - 2.1.9 +- 2.1.9 env: global: - - STRICT_VARIABLES=yes - - TRUSTED_NODE_DATA=yes + - STRICT_VARIABLES=yes matrix: - - PUPPET_VERSION="~> 4.7.0" - - PUPPET_VERSION="~> 4.5.0" - - PUPPET_VERSION="~> 3.8.0" - - PUPPET_VERSION="~> 4.4.0" - - PUPPET_VERSION="~> 4.3.0" - - PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes + - PUPPET_VERSION="~> 4.8.2" + - PUPPET_VERSION="~> 4.10.0" + - PUPPET_VERSION="~> 4.9.2" + - PUPPET_VERSION="~> 4.7.0" matrix: fast_finish: true - allow_failures: - - env: PUPPET_VERSION="~> 4.5.0" - - env: PUPPET_VERSION="~> 3.8.0" - - env: PUPPET_VERSION="~> 4.4.0" - - env: PUPPET_VERSION="~> 4.3.0" - - env: PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes + diff --git a/Gemfile b/Gemfile index 457f1171b..2be78f454 100644 --- a/Gemfile +++ b/Gemfile @@ -1,22 +1,23 @@ # ------------------------------------------------------------------------------ -# NOTE: SIMP Puppet rake tasks support ruby 2.0 and ruby 2.1 +# NOTE: SIMP Puppet rake tasks support ruby 2.1.9 # ------------------------------------------------------------------------------ -gem_sources = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org'] +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') + gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 4.0') gem 'rspec' gem 'rspec-puppet' gem 'hiera-puppet-helper' 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', '~> 1.3') - gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 3.0') + gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 3.5') end group :development do @@ -24,7 +25,6 @@ group :development do gem 'travis-lint' gem 'travish' gem 'puppet-blacksmith' - gem 'puppet-strings' gem 'guard-rake' gem 'pry' gem 'pry-doc' @@ -35,11 +35,7 @@ group :development do end group :system_tests do - # This patch is required to fix Beaker's broken `aio` handling and provide support for SuSE - # If you want to use 'bundle update --local', comment out this line and uncomment the next line - # If you do this, please remember not to check in that change. - gem 'beaker', :git => 'https://github.com/trevor-vaughan/beaker.git', :branch => 'BKR-978-2.51.0' - # gem 'beaker' + gem 'beaker' gem 'beaker-rspec' - gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.5') + gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.7') end diff --git a/Rakefile b/Rakefile index 3f95d1851..b3ed91ed2 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,4 @@ require 'simp/rake/pupmod/helpers' +require 'puppet-strings/tasks' Simp::Rake::Pupmod::Helpers.new(File.dirname(__FILE__)) - diff --git a/metadata.json b/metadata.json index 9cac81af9..1c2df63a6 100644 --- a/metadata.json +++ b/metadata.json @@ -36,5 +36,11 @@ "7" ] } + ], + "requirements": [ + { + "name": "puppet", + "version_requirement": ">= 4.7.0 < 5.0.0" + } ] }