beaker-hostgenerator 1.2.5 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e387a95bbe93f181e4a5f0baf92b148886618d497556be4ed47cbf17287ba5
-  data.tar.gz: 925e9d04966094243eeff5ce35d63235bc0518b2a429c37e28cfffe624d83649
+  metadata.gz: c6e8e91fce4675f5adad6c7a0f4a853a8a8c1af4cf33c6f3932d1d8d55469bea
+  data.tar.gz: 775063d8a44fa06695ae651781fab90de3850144277d5bc14c7371929b146e7e
 SHA512:
-  metadata.gz: ae8cf8bd290699375ab6d619510982c0ea11bdb968b5162576c57ed39e6134de16b47eed3315d5538dc4b0af751f82fd706a35f29310880cbd4cd2105f7f81d3
-  data.tar.gz: 41cb7168f8c0b5d1f14ae074fd4f431a37f1ba288d908f894c1b679e8463285e526d046a8109f43e2cbac4f460629d44c2424aa91443379e33881769f23e84fd
+  metadata.gz: 6538e676d55d51bdf8e8d6f0f2c73857ddfff3d183b87b4ebdc5a18403b97ac35fcc6335c0750826274b779b809708c124b70b84fa496b51468a07de3b33db6f
+  data.tar.gz: 2ee762fbb5585b54a079da11adf60f1cef9391c9ce965d8b36fdab54f22dba76baa7bb61db65d7c14e8c7be822e557269c70bb07f5e15c1f8c34db4c418b163a

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
@@ -33,7 +33,7 @@ module BeakerHostGenerator
         then "#{PE_TARBALL_SERVER}/archives/releases/#{version}/"
       when /#{base_regex}-rc\d+\Z/
         then "#{PE_TARBALL_SERVER}/archives/internal/%s/"
-      when /#{base_regex}-.*PEZ_.*/
+      when /#{base_regex}-.*(PEZ|pez)_.*/
         then "#{PE_TARBALL_SERVER}/%s/feature/ci-ready"
       when /#{base_regex}-.*/
         then "#{PE_TARBALL_SERVER}/%s/ci-ready"
@@ -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',
@@ -1448,6 +1466,15 @@ module BeakerHostGenerator
             '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.5'
+    STRING = '1.2.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.10
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 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