beaker-hostgenerator 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c94c791caf70b7295b868ffdce1b3f4754c2e5
-  data.tar.gz: f232a7d8052462634ffd27f177ed6ad4c93be187
+  metadata.gz: 0c562efcceaea000f8e2f134bd3c23e92ef712ec
+  data.tar.gz: d7b77a85511762068d8ba26e97f8b9f8dbe6bdb6
 SHA512:
-  metadata.gz: 2a30e8019eb4336ece8b179d6d384b175ae28274d6c91dfa0beabc38010405279b8495e65af56d720fea501ee9ddb9c1537fb114cf744eec193b71c5303bacdb
-  data.tar.gz: 793ac838de99e00b28aafdde352ef9846752e34edb314a0378e0f89cd89055e2ccb21146cfe02622e06d04982c3ce284a69c20cb2e627ceffaa50cedfc6c5af7
+  metadata.gz: 5963b93040fb980e87878af8f872340ce7a289e39bb03f2744fab3461861f81fc46a7a4e0578366ee5061f55e0f7c4925837c3dd88c154c234b7f313527c1e4b
+  data.tar.gz: 0e3a472485f6291dcc74f68ec527984952d52e5dfc38d0b56d9a4034aedf73fdce4e05f8f931231acc0a4bab3761f78ec083dbf7937ea0cc0d72d630acc0585b

data/lib/beaker-hostgenerator/data.rb

@@ -165,6 +165,12 @@ module BeakerHostGenerator
             'platform'           => 'el-5-x86_64',
             'packaging_platform' => 'el-5-x86_64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which',
+              'sed -i -e "/mingetty/d" /etc/inittab'
+            ]
+          },
           :vmpooler => {
             'template' => 'centos-5-x86_64'
           }
@@ -183,6 +189,13 @@ module BeakerHostGenerator
             'platform'           => 'el-6-x86_64',
             'packaging_platform' => 'el-6-x86_64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'rm -rf /var/run/network/*',
+              'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which',
+              'rm /etc/init/tty.conf'
+            ]
+          },
           :vmpooler => {
             'template' => 'centos-6-x86_64'
           }
@@ -192,6 +205,12 @@ module BeakerHostGenerator
             'platform'           => 'el-7-x86_64',
             'packaging_platform' => 'el-7-x86_64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'systemctl mask getty@tty1.service',
+              'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which ss'
+            ]
+          },
           :vmpooler => {
             'template' => 'centos-7-x86_64'
           }
@@ -270,6 +289,11 @@ module BeakerHostGenerator
             'platform'           => 'debian-7-amd64',
             'packaging_platform' => 'debian-7-amd64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'apt-get update && apt-get install -y cron locales-all net-tools wget'
+            ],
+          },
           :vmpooler => {
             'template' => 'debian-7-x86_64'
           }
@@ -288,6 +312,13 @@ module BeakerHostGenerator
             'platform'           => 'debian-8-amd64',
             'packaging_platform' => 'debian-8-amd64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'rm -f /usr/sbin/policy-rc.d',
+              'systemctl mask getty@tty1.service getty-static.service',
+              'apt-get update && apt-get install -y cron locales-all net-tools wget'
+            ]
+          },
           :vmpooler => {
             'template' => 'debian-8-x86_64'
           }
@@ -306,6 +337,13 @@ module BeakerHostGenerator
             'platform'           => 'debian-9-amd64',
             'packaging_platform' => 'debian-9-amd64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'rm -f /usr/sbin/policy-rc.d',
+              'systemctl mask getty@tty1.service getty-static.service',
+              'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv'
+            ]
+          },
           :vmpooler => {
             'template' => 'debian-9-x86_64'
           }
@@ -877,6 +915,12 @@ module BeakerHostGenerator
           :general => {
             'platform' => 'ubuntu-12.04-amd64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'apt-get install -y net-tools wget',
+              'locale-gen en_US.UTF-8'
+            ]
+          },
           :vmpooler => {
             'template' => 'ubuntu-1204-x86_64'
           }
@@ -895,6 +939,15 @@ module BeakerHostGenerator
             'platform'           => 'ubuntu-14.04-amd64',
             'packaging_platform' => 'ubuntu-14.04-amd64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              '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'
           }
@@ -945,6 +998,13 @@ module BeakerHostGenerator
             'platform'           => 'ubuntu-16.04-amd64',
             'packaging_platform' => 'ubuntu-16.04-amd64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'systemctl mask getty@tty1.service getty-static.service',
+              'apt-get install -y net-tools wget locales apt-transport-https',
+              'locale-gen en_US.UTF-8'
+            ]
+          },
           :vmpooler => {
             'template' => 'ubuntu-1604-x86_64'
           }

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -46,6 +46,7 @@ module BeakerHostGenerator
     def self.builtin_hypervisors()
       {
         'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler,
+        'docker' => BeakerHostGenerator::Hypervisor::Docker,
         'abs' => BeakerHostGenerator::Hypervisor::ABS
       }
     end
@@ -95,4 +96,5 @@ end
 # hypervisor implementation files.
 require 'beaker-hostgenerator/hypervisor/unknown'
 require 'beaker-hostgenerator/hypervisor/vmpooler'
+require 'beaker-hostgenerator/hypervisor/docker'
 require 'beaker-hostgenerator/hypervisor/abs'

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

@@ -0,0 +1,24 @@
+require 'beaker-hostgenerator/data'
+require 'beaker-hostgenerator/hypervisor'
+require 'deep_merge'
+
+module BeakerHostGenerator
+  module Hypervisor
+    class Docker < BeakerHostGenerator::Hypervisor::Interface
+      include BeakerHostGenerator::Data
+
+      def generate_node(node_info, base_config, bhg_version)
+        base_config['hypervisor'] = 'docker'
+        base_config['docker_cmd'] = ['/sbin/init']
+        base_config['image'] = node_info['ostype'].sub(/(\d)/, ':\1')
+        base_config['image'].sub!(/(\d{2})/, '\1.') if node_info['ostype'] =~ /^ubuntu/
+
+        platform = node_info['platform']
+        platform_info = get_platform_info(bhg_version, platform, :docker)
+        base_config.deep_merge! platform_info
+
+        return base_config
+      end
+    end
+  end
+end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.1.9'
+    STRING = '1.1.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -210,6 +210,7 @@ files:
 - lib/beaker-hostgenerator/generator.rb
 - lib/beaker-hostgenerator/hypervisor.rb
 - lib/beaker-hostgenerator/hypervisor/abs.rb
+- lib/beaker-hostgenerator/hypervisor/docker.rb
 - lib/beaker-hostgenerator/hypervisor/unknown.rb
 - lib/beaker-hostgenerator/hypervisor/vmpooler.rb
 - lib/beaker-hostgenerator/parser.rb