beaker-hostgenerator 1.2.4 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59fb820dff01b4a31334cd2116845ca4cf5a2b619e8f7dab40bd211a4215c621
-  data.tar.gz: 63cab9731cf0848e99e566e669970717066956aaadf98dcf08d90f90c92b0662
+  metadata.gz: c37b8881da26cd2afcdfecf1b82ef3490dba5095e6fc8940ec55898c78aefd8e
+  data.tar.gz: 3dafb9ff03ab68cff642cdc5037822e57a0165570c78cd7aa6ff75715220e055
 SHA512:
-  metadata.gz: 8b9d48966609f97026e0001a0b70f7cbb1e17fb8402571ded781f88358f82bb2004a0ef9dd409db67e6ba627ae5add95490b6d0343b7c57bbb9c4fbaa74e0468
-  data.tar.gz: ce8612a7728be91052ad3707b812b3e420a7ed07602cc09e62e1feb93664e8ec6031bde7b5b0f71c134502377a617f89c41979a0230817f525b4a2182fea9328
+  metadata.gz: 61cdf2bc25a48d3754303d03b76ad7782ec139c872c99f6f43d75b47dd70dcca471705e43d1f1ba248428a25e085de8c9ea5fe005180c7cafa6d31dc0ecda78f
+  data.tar.gz: 6192ed77e44b647f616b18357dce44288d69144f83f7665469143780cc698635f0eb36aeb876aed3b90f425cd4ef62c4ba66c7ba0e6c06dbf10328de725108a3

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.travis.yml

@@ -0,0 +1,10 @@
+before_install:
+  - gem update
+  - gem --version
+language: ruby
+script: "bundle exec rake test:spec"
+notifications:
+  email: false
+rvm:
+  - 2.6
+  - 2.4

data/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.5
+    MAIN_PE_VERSION=2021.0
     PE_TARBALL_SERVER="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local"
 
     def pe_version
@@ -41,15 +41,12 @@ module BeakerHostGenerator
         ''
       end
 
-      if(Gem::Version.new($1) < Gem::Version.new("#{MASTER_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
-        pe_branch = $1
+      pe_family = $1
+      gem_version = Gem::Version.new(pe_family)
+      if(gem_version < Gem::Version.new("#{MAIN_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
+        pe_branch = pe_family
       else
-        #Is this a Master PEZ build?
-        if(version =~ /.*(PEZ|pez)_.*/)
-          pe_branch = "master/feature"
-        else
-          pe_branch = 'master'
-        end
+        pe_branch = 'main'
       end
 
       return sprintf(source, ("#{pe_branch}" || ''))
@@ -246,7 +243,7 @@ module BeakerHostGenerator
           :docker => {
             'docker_image_commands' => [
               'cp /bin/true /sbin/agetty',
-              'yum install -y crontabs initscripts iproute openssl wget which'
+              'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
             ]
           },
           :vmpooler => {
@@ -772,6 +769,15 @@ module BeakerHostGenerator
             'template' => 'fedora-31-x86_64'
           }
         },
+        'fedora32-64' => {
+          :general => {
+            'platform'           => 'fedora-32-x86_64',
+            'packaging_platform' => 'fedora-32-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'fedora-32-x86_64'
+          }
+        },
         'huaweios6-POWER' => {
           :general => {
             'platform' => 'huaweios-6-powerpc'
@@ -1039,6 +1045,18 @@ module BeakerHostGenerator
             'template' => 'redhat-8-x86_64'
           }
         },
+        'redhat8-AARCH64' => {
+          :general => {
+            'platform'           => 'el-8-aarch64',
+            'packaging_platform' => 'el-8-aarch64'
+          },
+          :abs => {
+            'template' => 'redhat-8-arm64'
+          },
+          :vmpooler => {
+            'template' => 'redhat-8-x86_64'
+          }
+        },
         'scientific5-32' => {
           :general => {
             'platform'           => 'el-5-i386',
@@ -1431,6 +1449,32 @@ module BeakerHostGenerator
             'template' => 'ubuntu-1810-x86_64'
           }
         },
+        'ubuntu2004-64' => {
+          :general => {
+            'platform'           => 'ubuntu-20.04-amd64',
+            'packaging_platform' => 'ubuntu-20.04-amd64'
+          },
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'apt-get install -y net-tools wget locales apt-transport-https iproute2 gnupg',
+              'locale-gen en_US.UTF-8',
+              'echo LANG=en_US.UTF-8 > /etc/default/locale'
+            ]
+          },
+          :vmpooler => {
+            'template' => 'ubuntu-2004-x86_64'
+          }
+        },
+        'ubuntu2004-AARCH64' => {
+          :general => {
+            'platform'           => 'ubuntu-20.04-aarch64',
+            'packaging_platform' => 'ubuntu-20.04-aarch64'
+          },
+          :abs => {
+            'template' => 'ubuntu-2004-arm64'
+          },
+        },
         'vro6-64' => {
           :general => {
             'platform'           => 'sles-11-x86_64',

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.4'
+    STRING = '1.2.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.9
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -184,9 +184,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
+- ".travis.yml"
 - CHANGELOG.md
 - CODEOWNERS
 - CONTRIBUTING.md
@@ -233,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Beaker Host Generator Utility