Skip to content

Commit

Permalink
(SIMP-3164) Update static assets (#4)
Browse files Browse the repository at this point in the history
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-tuned
  • Loading branch information
op-ct authored and Nick Miller committed Jun 6, 2017
1 parent 5b93397 commit 664d9f0
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 36 deletions.
7 changes: 5 additions & 2 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.1.9
43 changes: 18 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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

15 changes: 7 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
# ------------------------------------------------------------------------------
# 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
gem 'travis'
gem 'travis-lint'
gem 'travish'
gem 'puppet-blacksmith'
gem 'puppet-strings'
gem 'guard-rake'
gem 'pry'
gem 'pry-doc'
Expand All @@ -35,8 +35,7 @@ group :development do
end

group :system_tests do
# This patch is required to fix Beaker's broken `aio` handling
gem 'beaker', :git => 'https://github.com/trevor-vaughan/beaker.git', :branch => 'BKR-931-2.51.0'
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
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'simp/rake/pupmod/helpers'
require 'puppet-strings/tasks'

Simp::Rake::Pupmod::Helpers.new(File.dirname(__FILE__))
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": "4.x"
"version_requirement": ">= 4.7.0 < 5.0.0"
}
],
"data_provider": "hiera"
Expand Down

0 comments on commit 664d9f0

Please sign in to comment.