From 4efaba9eac4fbd3eee91e3e7c0dd16cf7b9a72d9 Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Mon, 5 Feb 2018 19:19:56 -0700 Subject: [PATCH] (maint) pin pdk-templates version ref to workaround puppet 5.3.4 issue --- lib/pdk/util.rb | 11 ++++++----- spec/unit/pdk/util_spec.rb | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/pdk/util.rb b/lib/pdk/util.rb index a3b080eb8..7eedc52ae 100644 --- a/lib/pdk/util.rb +++ b/lib/pdk/util.rb @@ -209,11 +209,12 @@ def default_template_ref module_function :default_template_ref def puppetlabs_template_ref - if PDK::Util.development_mode? - PDK::TEMPLATE_REF #'origin/master' - else - PDK::TEMPLATE_REF - end + PDK::TEMPLATE_REF + # if PDK::Util.development_mode? + # 'origin/master' + # else + # PDK::TEMPLATE_REF + # end end module_function :puppetlabs_template_ref end diff --git a/spec/unit/pdk/util_spec.rb b/spec/unit/pdk/util_spec.rb index 9f9f161c5..c744d8ad8 100644 --- a/spec/unit/pdk/util_spec.rb +++ b/spec/unit/pdk/util_spec.rb @@ -443,7 +443,7 @@ end it 'returns origin/master' do - is_expected.to eq('origin/master') + is_expected.to eq('e07e4fdef2cf410a7006a3612f53ef1563ea829f') # 'origin/master') end end end