Merge pull request #176 from cthorn42/maint/master/PE-27608_fix_up_ma…

…ster_branch_pez_dir

(PE-27608) Master branch PEZ logic

lib/beaker-hostgenerator/data.rb

@@ -13,7 +13,7 @@ module BeakerHostGenerator
   # `include BeakerHostGenerator::Data` and then `<function>()`.
   module Data
     module_function
-
+    MASTER_PE_VERSION=2019.4
     PE_TARBALL_SERVER="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local"
 
     def pe_version
@@ -41,7 +41,16 @@ def pe_dir(version)
         ''
       end
 
-      pe_branch = Gem::Version.new($1) < Gem::Version.new('2019.4') || version =~ /#{base_regex}-rc\d+\Z/ ? $1 : 'master'
+      if(Gem::Version.new($1) < Gem::Version.new("#{MASTER_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
+        pe_branch = $1
+      else
+        #Is this a Master PEZ build?
+        if(version =~ /.*(PEZ|pez)_.*/)
+          pe_branch = "master/feature"
+        else
+          pe_branch = 'master'
+        end
+      end
 
       return sprintf(source, ("#{pe_branch}" || ''))
     end

spec/beaker-hostgenerator/generator_spec.rb

@@ -147,7 +147,7 @@ module BeakerHostGenerator
       end
 
       it "returns master/feature/ci-ready for a PEZ version" do
-        expect(BeakerHostGenerator::Data.pe_dir(pez_version)).to match(%r{master/feature/ci-ready})
+        expect(BeakerHostGenerator::Data.pe_dir(pez_version)).to match('master/feature')
       end
     end
   end