Skip to content

quick fix for failing travis builds #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
7yl4r wants to merge 6 commits into from
Closed

quick fix for failing travis builds #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10ea3a3
max puppetlabs_spec_helper to last passing version
7yl4r May 10, 2017
50ad166
fix puppet-lint arrow warnings
7yl4r May 10, 2017
b2bf136
skip tests on rubies depcrecated by puppet 4.10.0
7yl4r May 10, 2017
9829656
restore test against latest via "~> 4"
7yl4r May 10, 2017
9d1cbf7
use proper puppetlabs_spec_helper based on ruby -v
7yl4r May 10, 2017
7cea130
manually cherrypick master's a2cd83b
7yl4r Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ env:
- PUPPET_GEM_VERSION="~> 4.6.0"
- PUPPET_GEM_VERSION="~> 4.7.0"
- PUPPET_GEM_VERSION="~> 4.8.0"
- PUPPET_GEM_VERSION="~> 4.9.0"
- PUPPET_GEM_VERSION="~> 4.10.0"
- PUPPET_GEM_VERSION="~> 4"


sudo: false

script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
Expand Down Expand Up @@ -76,7 +79,9 @@ 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: 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
Expand All @@ -95,6 +100,16 @@ 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"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 4.10.0"

notifications:
email: false
4 changes: 3 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ else
gem 'facter', :require => false
end

gem 'puppetlabs_spec_helper', '>= 1.2.0', :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
Expand Down
8 changes: 4 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': }
Copy link
Copy Markdown
Member

@ghoneycutt ghoneycutt May 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

-> anchor { 'python::end': }

# Allow hiera configuration of python resources
create_resources('python::pip', $python_pips)
Expand Down
8 changes: 4 additions & 4 deletions manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {

Expand Down