beaker-hostgenerator 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f66ec9e9bd76078ef767cc152a9d22930c9cb20cd15c856e43149ccf87c04dc1
-  data.tar.gz: e9c0cda19a2cf2381b0e609e1a1aff9c2cd0dbc895b809fca0649556d306a1aa
+  metadata.gz: f3e4326354ac2f461c9d42ce6f2fbd7cc457b27653c054f1a0555d4d0efdff0f
+  data.tar.gz: 5931c224850c934fe091a3b473a2bf47a102b700f3fe06c77c39ab2062eca9cd
 SHA512:
-  metadata.gz: 91cf25527d7f1fc7dc5de73929e3a774d5e1bdc8c934c267419501845a011e3c752b8fe3484ba661de49f47ba9318e5d6f18d80223ffcb2ccb5ace5aa21dfc2a
-  data.tar.gz: 2f49add8f297dd0938a63c7ff2f2b6300e0d8ba0a0bc3498035aefc81747a0ee6ea12adc96eacfa186735bb496be4b8676226f4b6b0eb22ca8343473b6803b9e
+  metadata.gz: caf236c3caf1156f7062090dbb10a776350373bc4430612a509b4fa11a1ab662cc9e2cb3a36ccafdeae8ece1a292a465ad151d3241d091191fba370e36e3a4d3
+  data.tar.gz: 49b20acb26822cdfd7376c704c33f8581403d191419da42776f25a857190fb1454fa7dd6b42a0052fdfb97349bbcda61edc230a0e1818400343cee005baace12

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.6.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.6.0) (2021-08-17)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.5.0...1.6.0)
+
+**Implemented enhancements:**
+
+- Generate Ubuntu ABS, vmpooler, and Docker templates on the fly [\#218](https://github.com/voxpupuli/beaker-hostgenerator/pull/218) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Set up Debian 11 on Docker [\#220](https://github.com/voxpupuli/beaker-hostgenerator/pull/220) ([ekohl](https://github.com/ekohl))
+
 ## [1.5.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.5.0) (2021-06-14)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.4.0...1.5.0)

data/lib/beaker-hostgenerator/data.rb

@@ -100,6 +100,55 @@ module BeakerHostGenerator
         }
       end
 
+      # Ubuntu
+      #
+      # Generate LTS platforms
+      (14..20).select(&:even?).each do |release|
+        # 32 bit support was dropped in Ubuntu 18.04
+        if release < 18
+          result["ubuntu#{release}04-32"] = {
+            :general => {
+              'platform' => "ubuntu-#{release}.04-i386"
+            }
+          }
+        end
+
+        result["ubuntu#{release}04-64"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.04-amd64"
+          }
+        }
+
+        result["ubuntu#{release}04-POWER"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.04-ppc64el"
+          }
+        }
+
+        result["ubuntu#{release}04-AARCH64"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.04-aarch64"
+          }
+        }
+      end
+
+      # Generate STS platforms
+      [20, 21].each do |release|
+        unless release.even?
+          result["ubuntu#{release}04-64"] = {
+            :general => {
+              'platform' => "ubuntu-#{release}.04-amd64"
+            }
+          }
+        end
+
+        result["ubuntu#{release}10-64"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.10-amd64"
+          }
+        }
+      end
+
       result.merge!({
         'aix53-POWER' => {
           :general => {
@@ -592,6 +641,13 @@ module BeakerHostGenerator
             'platform'           => 'debian-11-amd64',
             'packaging_platform' => 'debian-11-amd64'
           },
+          :docker => {
+            '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 gnupg'
+            ]
+          },
           :vagrant => {
             'box' => 'debian/bullseye64',
           },
@@ -1165,216 +1221,6 @@ module BeakerHostGenerator
             'template' => 'solaris-114-x86_64'
           }
         },
-        'ubuntu1004-32' => {
-          :general => {
-            'platform' => 'ubuntu-10.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1004-i386'
-          }
-        },
-        'ubuntu1004-64' => {
-          :general => {
-            'platform' => 'ubuntu-10.04-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1004-x86_64'
-          }
-        },
-        'ubuntu1204-32' => {
-          :general => {
-            'platform' => 'ubuntu-12.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1204-i386'
-          }
-        },
-        'ubuntu1204-64' => {
-          :general => {
-            'platform' => 'ubuntu-12.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget',
-              'locale-gen en_US.UTF-8'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1204-x86_64'
-          }
-        },
-        'ubuntu1404-32' => {
-          :general => {
-            'platform'           => 'ubuntu-14.04-i386',
-            'packaging_platform' => 'ubuntu-14.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1404-i386'
-          }
-        },
-        'ubuntu1404-64' => {
-          :general => {
-            'platform'           => 'ubuntu-14.04-amd64',
-            'packaging_platform' => 'ubuntu-14.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'rm /usr/sbin/policy-rc.d',
-              'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl',
-              'apt-get install -y net-tools wget apt-transport-https',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1404-x86_64'
-          }
-        },
-        'ubuntu1504-32' => {
-          :general => {
-            'platform' => 'ubuntu-15.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1504-i386'
-          }
-        },
-        'ubuntu1504-64' => {
-          :general => {
-            'platform' => 'ubuntu-15.04-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1504-x86_64'
-          }
-        },
-        'ubuntu1510-32' => {
-          :general => {
-            'platform' => 'ubuntu-15.10-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1510-i386'
-          }
-        },
-        'ubuntu1510-64' => {
-          :general => {
-            'platform' => 'ubuntu-15.10-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1510-x86_64'
-          }
-        },
-        'ubuntu1604-32' => {
-          :general => {
-            'platform'           => 'ubuntu-16.04-i386',
-            'packaging_platform' => 'ubuntu-16.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1604-i386'
-          }
-        },
-        'ubuntu1604-64' => {
-          :general => {
-            'platform'           => 'ubuntu-16.04-amd64',
-            'packaging_platform' => 'ubuntu-16.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget locales apt-transport-https',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1604-x86_64'
-          }
-        },
-        'ubuntu1604-POWER' => {
-          :general => {
-            'platform'           => 'ubuntu-16.04-ppc64el',
-            'packaging_platform' => 'ubuntu-16.04-ppc64el'
-          },
-          :abs => {
-            'template' => 'ubuntu-16.04-power8'
-          }
-        },
-        'ubuntu1610-32' => {
-          :general => {
-            'platform' => 'ubuntu-16.10-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1610-i386'
-          }
-        },
-        'ubuntu1610-64' => {
-          :general => {
-            'platform' => 'ubuntu-16.10-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1610-x86_64'
-          }
-        },
-        'ubuntu1804-64' => {
-          :general => {
-            'platform'           => 'ubuntu-18.04-amd64',
-            'packaging_platform' => 'ubuntu-18.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-1804-x86_64'
-          }
-        },
-        'ubuntu1810-64' => {
-          :general => {
-            'platform'           => 'ubuntu-18.10-amd64',
-            'packaging_platform' => 'ubuntu-18.10-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget locales apt-transport-https iproute2',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            '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/abs.rb

@@ -27,6 +27,22 @@ module BeakerHostGenerator
           base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
         when /^fedora/
           base_config['template'] = base_config['platform']
+        when /^ubuntu/
+          base_template = node_info['ostype'].sub('ubuntu', 'ubuntu-')
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when '32'
+                   'i386'
+                 when 'AARCH64'
+                   'arm64'
+                 when 'POWER'
+                   base_template = node_info['ostype'].sub(/ubuntu(\d\d)/, 'ubuntu-\1.')
+                   'power8'
+                 else
+                   raise "Unknown bits '#{node_info['bits']}' for '#{node_info['ostype']}'"
+                 end
+          base_config['template'] = "#{base_template}-#{arch}"
         end
 
         base_config

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

@@ -17,6 +17,33 @@ module BeakerHostGenerator
           base_config['image'] = "amd64/#{base_config['image']}"
         end
 
+        docker_commands = []
+
+        case node_info['ostype']
+        when /^ubuntu/
+          docker_commands << 'cp /bin/true /sbin/agetty'
+
+          if node_info['ostype'] =~ /1404/
+            docker_commands << 'rm /usr/sbin/policy-rc.d'
+            docker_commands << 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+          end
+
+          extra_packages_to_install = case node_info['ostype']
+                                      when /1404/
+                                        ['apt-transport-https']
+                                      when /1604/
+                                        ['locales']
+                                      else
+                                        ['locales', 'iproute2', 'gnupg']
+                                      end
+
+          docker_commands << "apt-get install -y net-tools wget #{extra_packages_to_install.join(' ')}"
+          docker_commands << 'locale-gen en_US.UTF-8'
+          docker_commands << 'echo LANG=en_US.UTF-8 > /etc/default/locale'
+
+          base_config['docker_image_commands'] = docker_commands
+        end
+
         return base_generate_node(node_info, base_config, bhg_version, :docker)
       end
     end

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

@@ -8,7 +8,7 @@ module BeakerHostGenerator
       include BeakerHostGenerator::Data
 
       # default global configuration keys
-      def global_config()
+      def global_config
         {
           'pooling_api' => 'http://vmpooler.delivery.puppetlabs.net/'
         }
@@ -22,6 +22,17 @@ module BeakerHostGenerator
           base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
         when /^fedora/
           base_config['template'] = base_config['platform']
+        when /^ubuntu/
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when '32'
+                   'i386'
+                 else
+                   nil
+                 end
+
+          base_config['template'] = "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
         end
 
         # Some vmpooler/vsphere platforms have special requirements.

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.5.0'
+    STRING = '1.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest