beaker-hostgenerator 1.2.3 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42472334093836d68675b573dd3c6230d0d64c328a1adf039d54aac0cf7bf5f
-  data.tar.gz: b557be19f94c0ea03d0c002dc4f8a752e0482bf7f3ee74dd8da3a48e602919eb
+  metadata.gz: 872636066ef4764b18f301abb8a56794444f59ba0c09f744da73dfe2c8d1c27c
+  data.tar.gz: 656c7cb00f526ec54fa4f33393e796d9d9de779899b7631260ce10262ff7ecd8
 SHA512:
-  metadata.gz: 806df13a79611484638bdbed2f7277710469de9e45cc5b05ce02ceb12e7be64a38bbb2e4803471f1d886eeeb80fc0eae2094c331886ff365c5dbe32663f12ffb
-  data.tar.gz: 51fa9b7346e59ccb89dbb67acd4ead60bfed6f0c520593f62967551b45dfbc21ce88a9dc6bbe50d80b602b7dc706e4d38dacec725d9845288ed9cd63b9ac26f5
+  metadata.gz: d10353af7b5f09d9afeccbcbdaa484a7ebd5a68734701599a288de6ab6d1f688613426f7d8e904426765b9fa13980f34c7e475140fbd58d79e4cd2c6d30bdef6
+  data.tar.gz: 75a150fc247c742778feb8fb37c7997991a0bf281b467a3b0f8e0c02d9c4b90543fae2d9aef0788059b0bb654a35da410040ac910cd6a0a75e144e04d9dfc5f8

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

@@ -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}" || ''))
@@ -246,7 +255,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 => {
@@ -514,7 +523,7 @@ module BeakerHostGenerator
             'docker_image_commands' => [
               'cp /bin/true /sbin/agetty',
               'rm -f /usr/sbin/policy-rc.d',
-              'apt-get update && apt-get install -y cron locales-all net-tools wget'
+              'apt-get update && apt-get install -y cron locales-all net-tools wget apt-transport-https'
             ]
           },
           :vagrant => {
@@ -536,7 +545,7 @@ module BeakerHostGenerator
             'docker_image_commands' => [
               'cp /bin/true /sbin/agetty',
               'rm -f /usr/sbin/policy-rc.d',
-              'apt-get update && apt-get install -y cron locales-all net-tools wget'
+              'apt-get update && apt-get install -y cron locales-all net-tools wget apt-transport-https'
             ]
           }
         },
@@ -549,7 +558,7 @@ module BeakerHostGenerator
             'docker_image_commands' => [
               'cp /bin/true /sbin/agetty',
               'rm -f /usr/sbin/policy-rc.d',
-              'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv gnupg'
+              'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv gnupg apt-transport-https'
             ]
           },
           :vagrant => {
@@ -571,6 +580,9 @@ module BeakerHostGenerator
               'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg'
             ]
           },
+          :vagrant => {
+            'box' => 'debian/buster64',
+          },
           :vmpooler => {
             'template' => 'debian-10-x86_64'
           }
@@ -769,6 +781,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'
@@ -1036,6 +1057,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',
@@ -1428,6 +1461,23 @@ 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'
+          }
+        },
         '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.3'
+    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.3
+  version: 1.2.8
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-09-29 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