From 10ea3a347ebae43c1d440149ce8910208bd3cd54 Mon Sep 17 00:00:00 2001 From: Tylar Date: Wed, 10 May 2017 19:27:19 +0000 Subject: [PATCH 1/6] max puppetlabs_spec_helper to last passing version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 898be012..0633fabc 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ else gem 'facter', :require => false end -gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false +gem 'puppetlabs_spec_helper', '>= 1.2.0', '<= 1.2.2', :require => false gem 'rspec-puppet', :require => false gem 'puppet-lint', '~> 2.0', :require => false gem 'simplecov', :require => false From 50ad166cd4c85630aa35f29b10ea4601eaafef59 Mon Sep 17 00:00:00 2001 From: Tylar Murray Date: Wed, 10 May 2017 19:35:06 +0000 Subject: [PATCH 2/6] fix puppet-lint arrow warnings --- manifests/init.pp | 8 ++++---- manifests/install.pp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 8b3caf30..a4e22236 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -133,10 +133,10 @@ } # Anchor pattern to contain dependencies - anchor { 'python::begin': } -> - class { 'python::install': } -> - class { 'python::config': } -> - anchor { 'python::end': } + anchor { 'python::begin': } + -> class { 'python::install': } + -> class { 'python::config': } + -> anchor { 'python::end': } # Allow hiera configuration of python resources create_resources('python::pip', $python_pips) diff --git a/manifests/install.pp b/manifests/install.pp index afe17dac..72da81de 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -164,12 +164,12 @@ } if $::python::rhscl_use_public_repository { - Package <| tag == 'python-scl-repo' |> -> - Package <| tag == 'python-scl-package' |> + Package <| tag == 'python-scl-repo' |> + -> Package <| tag == 'python-scl-package' |> } - Package <| tag == 'python-scl-package' |> -> - Package <| tag == 'python-pip-package' |> + Package <| tag == 'python-scl-package' |> + -> Package <| tag == 'python-pip-package' |> } default: { From b2bf136a0a50633974d7e2b5e73fb6764ac33412 Mon Sep 17 00:00:00 2001 From: Tylar Date: Wed, 10 May 2017 20:03:24 +0000 Subject: [PATCH 3/6] skip tests on rubies depcrecated by puppet 4.10.0 --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef9dcf18..f38924e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,8 @@ env: - PUPPET_GEM_VERSION="~> 4.6.0" - PUPPET_GEM_VERSION="~> 4.7.0" - PUPPET_GEM_VERSION="~> 4.8.0" - - PUPPET_GEM_VERSION="~> 4" + - PUPPET_GEM_VERSION="~> 4.9.0" + - PUPPET_GEM_VERSION="~> 4.10.0" sudo: false @@ -76,7 +77,7 @@ matrix: - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4.8.0" - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 4" + env: PUPPET_GEM_VERSION="~> 4.9.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3.1.0" - rvm: 2.3.1 @@ -95,6 +96,11 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.8.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes" + # deprecated ruby versions in puppet 4.10.0 + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 4.10.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 4.10.0" notifications: email: false From 9829656db2d706e00e028266697fc490c5dc6e20 Mon Sep 17 00:00:00 2001 From: Tylar Date: Wed, 10 May 2017 20:17:11 +0000 Subject: [PATCH 4/6] restore test against latest via "~> 4" --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f38924e8..8ea4227c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,8 @@ env: - PUPPET_GEM_VERSION="~> 4.8.0" - PUPPET_GEM_VERSION="~> 4.9.0" - PUPPET_GEM_VERSION="~> 4.10.0" + - PUPPET_GEM_VERSION="~> 4" + sudo: false From 9d1cbf71044ec13b6005aba946962ac3e89db58f Mon Sep 17 00:00:00 2001 From: Tylar Date: Wed, 10 May 2017 20:20:48 +0000 Subject: [PATCH 5/6] use proper puppetlabs_spec_helper based on ruby -v --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0633fabc..50a8e52a 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,9 @@ else gem 'facter', :require => false end -gem 'puppetlabs_spec_helper', '>= 1.2.0', '<= 1.2.2', :require => false +gem 'puppetlabs_spec_helper', '2.0.2', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' +gem 'puppetlabs_spec_helper', '>= 2.0.0', :require => false if RUBY_VERSION >= '1.9' + gem 'rspec-puppet', :require => false gem 'puppet-lint', '~> 2.0', :require => false gem 'simplecov', :require => false From 7cea130225f400e76fabca442163190acf2f287a Mon Sep 17 00:00:00 2001 From: Tylar Date: Tue, 27 Jun 2017 14:05:47 +0000 Subject: [PATCH 6/6] manually cherrypick master's a2cd83b --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8ea4227c..34e0ec2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,6 +80,8 @@ matrix: env: PUPPET_GEM_VERSION="~> 4.8.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4.9.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 4.10.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3.1.0" - rvm: 2.3.1 @@ -98,6 +100,11 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.8.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes" + # deprecated ruby versions in puppet 4.9.0 + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 4.9.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 4.9.0" # deprecated ruby versions in puppet 4.10.0 - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 4.10.0"