Skip to content

Commit

Permalink
Fixes #29541: Use Facter 4 in testing
Browse files Browse the repository at this point in the history
Drops pinned dependencies in Gemfile.
  • Loading branch information
ehelms committed Apr 27, 2020
1 parent 473629d commit 30ea2c0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
sudo: false
language: ruby
addons:
apt:
Expand All @@ -8,9 +7,7 @@ addons:
- xsltproc
- docbook-xsl
- ca-certificates
rvm: 2.4
env:
- PUPPET_VERSION=5.0
rvm: 2.5
script:
- bundle exec rake rubocop
#
Expand All @@ -23,8 +20,11 @@ script:
- INSTDIR=$(mktemp -d)
- bundle exec rake build install PREFIX=$INSTDIR
- bundle exec $INSTDIR/sbin/foreman-installer --help --scenario foreman
- cat $INSTDIR/var/log/foreman-installer/foreman.log
- bundle exec $INSTDIR/sbin/foreman-installer --help --scenario foreman-proxy-content
- cat $INSTDIR/var/log/foreman-installer/foreman-proxy-content.log
- bundle exec $INSTDIR/sbin/foreman-installer --help --scenario katello
- cat $INSTDIR/var/log/foreman-installer/katello.log
- bundle exec $INSTDIR/sbin/foreman-proxy-certs-generate --help
- bundle exec $INSTDIR/sbin/foreman-proxy-certs-generate --help |grep -q certs-update-server
#
Expand Down
19 changes: 5 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,18 @@ source 'https://rubygems.org'
gem 'kafo', '~> 4.1'
gem 'librarian-puppet'
gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '~> 6.0'
if RUBY_VERSION < '2.1'
gem 'puppet-strings', '< 2.0.0'
else
gem 'puppet-strings'
end
gem 'facter', '>= 3.0'

gem 'puppet-strings'
gem 'rake'
gem 'rdoc', '< 6' if RUBY_VERSION < '2.2'

group :test do
gem 'rspec'
gem 'rubocop', '~> 0.50.0'
end

group :development do
# Needed to pin dependencies
# Dependencies for rake pin_modules
gem 'puppet_forge'
if RUBY_VERSION < '2.1'
gem 'semverse', '< 2'
elsif RUBY_VERSION < '2.2'
gem 'semverse', '< 3'
else
gem 'semverse'
end
gem 'semverse'
end

0 comments on commit 30ea2c0

Please sign in to comment.