beaker-hostgenerator 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b9d70956aa12b639007a381adf61c012a5ec0b5a7aad0e89347b8c8c481e47
-  data.tar.gz: d45099a474b8895f6a7d8c06f725f1d4fc00a66ee3cc4692e1d70c0cbaba8a85
+  metadata.gz: 872636066ef4764b18f301abb8a56794444f59ba0c09f744da73dfe2c8d1c27c
+  data.tar.gz: 656c7cb00f526ec54fa4f33393e796d9d9de779899b7631260ce10262ff7ecd8
 SHA512:
-  metadata.gz: a30a9ee9f577ca147b984d67f68fe45de2f46493bf409c20d8f0aa0369e815dfd22234370be21c4bf091ddee28bb0e569015d858367fd49989d932b9d4ac7625
-  data.tar.gz: 787115326d35df17c8a790f5d7e35405f5d2930f91e9293c85945eb7bf2f257438ac3186fff874a3977cf4114c814146cbff74433c012414ba0528870f7b3a34
+  metadata.gz: d10353af7b5f09d9afeccbcbdaa484a7ebd5a68734701599a288de6ab6d1f688613426f7d8e904426765b9fa13980f34c7e475140fbd58d79e4cd2c6d30bdef6
+  data.tar.gz: 75a150fc247c742778feb8fb37c7997991a0bf281b467a3b0f8e0c02d9c4b90543fae2d9aef0788059b0bb654a35da410040ac910cd6a0a75e144e04d9dfc5f8

data/lib/beaker-hostgenerator/data.rb

@@ -14,6 +14,7 @@ module BeakerHostGenerator
   module Data
     module_function
     MASTER_PE_VERSION=2019.5
+    MAIN_PE_VERSION=2021.0
     PE_TARBALL_SERVER="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local"
 
     def pe_version
@@ -41,15 +42,23 @@ module BeakerHostGenerator
         ''
       end
 
-      if(Gem::Version.new($1) < Gem::Version.new("#{MASTER_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
+      gem_version = Gem::Version.new($1)
+      if(gem_version < Gem::Version.new("#{MASTER_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
         pe_branch = $1
-      else
+      elsif gem_version < Gem::Version.new("#{MAIN_PE_VERSION}")
         #Is this a Master PEZ build?
         if(version =~ /.*(PEZ|pez)_.*/)
           pe_branch = "master/feature"
         else
           pe_branch = 'master'
         end
+      else
+        #Is this a Main PEZ build?
+        if(version =~ /.*(PEZ|pez)_.*/)
+          pe_branch = "main/feature"
+        else
+          pe_branch = 'main'
+        end
       end
 
       return sprintf(source, ("#{pe_branch}" || ''))

data/lib/beaker-hostgenerator/hypervisor/vagrant.rb

@@ -11,7 +11,7 @@ module BeakerHostGenerator
         if node_info['ostype'] =~ /^centos/
           base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1')
         elsif node_info['ostype'] =~ /^fedora/
-          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + 'cloud-base'
+          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + '-cloud-base'
         else
           base_config['box'] = "generic/#{node_info['ostype']}"
         end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.2.7'
+    STRING = '1.2.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest