(maint) pin pdk-templates version ref to workaround puppet 5.3.4 issue

puppetlabs · Feb 6, 2018 · 4efaba9 · 4efaba9
1 parent b5f4fe6
commit 4efaba9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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