From 7d28b7c231118b094708bcace0f9b65d0985f614 Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Sat, 30 May 2020 15:43:59 +0800 Subject: [PATCH] (maint) Remove pin to custom version of Litmus Previously the litmus gem was pinned to a version in Michael Lombardi's fork. This commit removes the pin as the PR mentioned was merged into Litmus 0.16.0 Ref - https://github.com/puppetlabs/puppet_litmus/commit/f09c9db745e2fdded9ebc75dec1705e39722acdb --- Gemfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 565a0edfb..d4d35208a 100644 --- a/Gemfile +++ b/Gemfile @@ -26,10 +26,8 @@ end group :acceptance do # Litmus has dependencies which require Ruby 2.5 (Puppet 6) or above. if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0') - # Until https://github.com/puppetlabs/puppet_litmus/pull/248 is merged we need to use the source of the - # of the PR. Not the greatest and prone to error, but without it, all litmus based testing is broken. - # This can be reverted once this PR is merged and Litmus is released with this fix. - gem 'puppet_litmus', git: 'https://github.com/michaeltlombardi/puppet_litmus', ref: 'maint/master/fix-upload-file' + # Can't use puppet_litmus 0.18.0 until https://github.com/puppetlabs/puppet_litmus/issues/300 is fixed. + gem 'puppet_litmus', '~> 0.17.0' gem 'net-ssh', '~> 5.2' end end