beaker 3.21.1 → 3.22.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTU2YTkyMzA2NzA5NmZhMzNjNDY1ODc1YjhiZTQ5NzdhZDM1OTlmNA==
+    MDNlYWQ5NWZjNDVjNzA3OGU2NjZiYjJjYzZmMGE2ZTQ1M2E0NTAyOQ==
   data.tar.gz: !binary |-
-    OTRiN2MxOGUxNGQ2N2UwMDhjYjQyNTBkMzY3YjA5Mjc0Mzk0MGUxMA==
+    OGE5ZGYxYzg4MzNjMWEzZWExMjcwY2E3OWVhYjEyODM4ZmQ2ZWI2ZA==
 SHA512:
   metadata.gz: !binary |-
-    OTRkYmJlYTViOTgyNTY1Mjk0NjQ1ODM0NDJhZjkyNDc2ZGM2M2RlNzg2NDJj
-    MGE3MDIxYzFkMjgzYjZjMzc4NzU0M2Y0MjdjOTAyNmFkYmIyMWU0Yjg4MmY3
-    OGNmOTUyMTZhY2MwMGI4OWFlZTAxZTdkOTU1MDZjOGEyMzJkODc=
+    MjRiNTAyNmNlNmU2OTA3OTJhMWYxZDFkZWJkMjVkODRmMWNmMTYzNzljMGEx
+    NTRkNDdiMmI5YWJkNmEyNmJhNTBkMzliNTgwMDc3N2VmZDczY2UyYzZmZWI5
+    OTUxMmQ3ZGNjZjE3NTlkZTk5NTJiNjIwNDY4NmVlMmE4MTE5OWQ=
   data.tar.gz: !binary |-
-    NGJmNDJiOTAwNzFjYmU3Y2VhYmZiMGJiMmMxODVmNDA1Yzg3ZTY5YTg2MWM2
-    YjIxMzhkYzliNjc2MTA5M2VmMjVjZmQ0ODhkNTU3MGEzMjcxODZjODhjZWI4
-    YWRlYjE4NjgyNmUxNjkwNDlkNTRjMDlhNWE3ZTUxNGM1ODY2YjE=
+    ODQwYThmMTc3NmQwYTQ1ODhkMGNlMDlmYjkxMWFhN2YxYzZhYTlmNTE5OWMw
+    YzAyMTg0NGU2NDE0NDNiZjA3ODJhMWQ3MzE5NzhjNTM2N2Y4ZWY3ZjE0NzAy
+    MmJlODdhMWMwYTIxODY3Mjg5ZTk3MGVlYjExM2U5ZmU0MDc1ZWY=

data/acceptance/tests/base/dsl/helpers/host_helpers/archive_file_from_test.rb

@@ -40,7 +40,7 @@ test_name "dsl::helpers::host_helpers #archive_file_from" do
       expected_path = File.join(tmpdir, default)
 
       tgz = Zlib::GzipReader.new(File.open(tar_path, 'rb'))
-      Archive::Tar::Minitar.unpack(tgz, expected_path)
+      Minitar.unpack(tgz, expected_path)
       assert_equal('number of the beast', File.read(expected_path + '/' + filepath).strip)
     end
   end

data/beaker.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'
-  s.add_runtime_dependency 'minitar', '~> 0.5.4'
+  s.add_runtime_dependency 'minitar', '~> 0.6'
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
   s.add_runtime_dependency 'net-ssh', '~> 4.0'
@@ -50,13 +50,19 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker-hostgenerator'
   s.add_runtime_dependency 'beaker-puppet', '~> 0.0'
 
+  # A minor setback for a major comeback (BKR-841)
+  #
+  # Beaker uses nokogiri but it was not declared as direct dependency
+  # before as one of the hypervisor gems included it
+  s.add_runtime_dependency 'nokogiri', '~> 1.8.0'
+
   # Optional provisioner specific support
-  s.add_runtime_dependency 'docker-api'
-  s.add_runtime_dependency 'fog', '~> 1.38'
+  s.add_runtime_dependency 'beaker-docker', '~> 0.1'
   s.add_runtime_dependency 'beaker-aws', '~> 0.1'
   s.add_runtime_dependency 'beaker-vmpooler', '~> 0.1'
   s.add_runtime_dependency 'beaker-google', '~> 0.1'
   s.add_runtime_dependency 'beaker-vagrant', '~> 0.1'
   s.add_runtime_dependency 'beaker-vmware', '~> 0.1'
+  s.add_runtime_dependency 'beaker-openstack', '~> 0.1'
 
 end

data/docs/how_to/hypervisors/README.md

@@ -41,13 +41,15 @@ In order to offset this, we've made a listing of gems and community-supported fo
 
 Hypervisor gems made by puppet (pre-included in beaker 3.x):
 
-| Hypervisor               | Fork                                                             |
-| :----------------------: | :---------------------------------------------------------:      |
-| Vmpooler                 | [beaker-vmpooler](https://github.com/puppetlabs/beaker-vmpooler) |
-| AWS                      | [beaker-aws](https://github.com/puppetlabs/beaker-aws)           |
-| Google Compute           | [beaker-google](https://github.com/puppetlabs/beaker-google)     |
-| Vagrant                  | [beaker-vagrant](https://github.com/puppetlabs/beaker-vagrant)   |
-| VMware/Vsphere           | [beaker-vmware](https://github.com/puppetlabs/beaker-vmware)     |
+| Hypervisor               | Fork                                                               |
+| :----------------------: | :---------------------------------------------------------:        |
+| Vmpooler                 | [beaker-vmpooler](https://github.com/puppetlabs/beaker-vmpooler)   |
+| AWS                      | [beaker-aws](https://github.com/puppetlabs/beaker-aws)             |
+| Vagrant                  | [beaker-vagrant](https://github.com/puppetlabs/beaker-vagrant)     |
+| VMware/Vsphere           | [beaker-vmware](https://github.com/puppetlabs/beaker-vmware)       |
+| Docker                   | [beaker-docker](https://github.com/puppetlabs/beaker-docker)       |
+| Openstack                | [beaker-openstack](https://github.com/puppetlabs/beaker-openstack) |
+| Google Compute           | [beaker-google](https://github.com/puppetlabs/beaker-google)       |
 
 Hypervisor gems and beaker forks made by community:
 

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -260,7 +260,7 @@ module Beaker
         #
         # @return [Result] Returns the result of the #scp_from operation.
         def archive_file_from(host, from_path, opts = {}, archive_root = 'archive/sut-files', archive_name = 'sut-files.tgz')
-          require 'archive/tar/minitar'
+          require 'minitar'
           filedir = File.dirname(from_path)
           targetdir = File.join(archive_root, host.hostname, filedir)
           # full path to check for existance later
@@ -277,7 +277,7 @@ module Beaker
         # @visibility private
         def create_tarball(path, archive_name)
           tgz = Zlib::GzipWriter.new(File.open(archive_name, 'wb'))
-          Archive::Tar::Minitar.pack(path, tgz)
+          Minitar.pack(path, tgz)
         end
         private :create_tarball
 

data/lib/beaker/host/pswindows/exec.rb

@@ -185,7 +185,7 @@ module PSWindows::Exec
       keys = [key_str]
       keys << key_str.upcase if key_str.upcase != key_str
       keys.each do |env_key|
-        env_array << "#{env_key}=\"#{val}\""
+        env_array << "#{env_key}=#{val}"
       end
     end
     env_array

data/lib/beaker/hypervisor.rb

@@ -22,14 +22,6 @@ module Beaker
       @logger.notify("Beaker::Hypervisor, found some #{type} boxes to create")
 
       hyper_class = case type
-        when /^aix$/
-          Beaker::Aixer
-        when /^solaris$/
-          Beaker::Solaris
-        when /^docker$/
-          Beaker::Docker
-        when /^openstack$/
-          Beaker::OpenStack
         when /^noop$/
           Beaker::Noop
         when /^(default)|(none)$/
@@ -120,10 +112,4 @@ module Beaker
   end
 end
 
-[
-  'docker',
-  'openstack',
-  'noop'
-].each do |lib|
-  require "beaker/hypervisor/#{lib}"
-end
+require "beaker/hypervisor/noop"

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.21.1'
+    STRING = '3.22.0'
   end
 end

data/spec/beaker/host/pswindows/exec_spec.rb

@@ -59,12 +59,12 @@ module Beaker
 
       it 'takes an env hash with var_name/value pairs' do
         expect( instance.environment_string( {:HOME => '/', :http_proxy => 'http://foo'} ) ).
-          to be == 'set "HOME="/"" && set "http_proxy="http://foo"" && set "HTTP_PROXY="http://foo"" && '
+          to be == 'set "HOME=/" && set "http_proxy=http://foo" && set "HTTP_PROXY=http://foo" && '
       end
 
       it 'takes an env hash with var_name/value[Array] pairs' do
         expect( instance.environment_string( {:LD_PATH => ['/', '/tmp']}) ).
-          to be == "set \"LD_PATH=\"/:/tmp\"\" && "
+          to be == "set \"LD_PATH=/:/tmp\" && "
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.21.1
+  version: 3.22.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: hocon
   requirement: !ruby/object:Gem::Requirement
@@ -305,33 +305,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: docker-api
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: beaker-docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.38'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.38'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: beaker-aws
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +402,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: beaker-openstack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Puppet's accceptance testing harness
 email:
 - delivery@puppet.com
@@ -555,8 +569,6 @@ files:
 - docs/how_to/hosts/cisco.md
 - docs/how_to/hosts/eos.md
 - docs/how_to/hypervisors/README.md
-- docs/how_to/hypervisors/docker.md
-- docs/how_to/hypervisors/openstack.md
 - docs/how_to/hypervisors/solaris.md
 - docs/how_to/install_puppet.md
 - docs/how_to/platform_specific_tag_confines.md
@@ -639,9 +651,7 @@ files:
 - lib/beaker/host/windows/user.rb
 - lib/beaker/host_prebuilt_steps.rb
 - lib/beaker/hypervisor.rb
-- lib/beaker/hypervisor/docker.rb
 - lib/beaker/hypervisor/noop.rb
-- lib/beaker/hypervisor/openstack.rb
 - lib/beaker/junit.xsl
 - lib/beaker/logger.rb
 - lib/beaker/logger_junit.rb
@@ -711,10 +721,8 @@ files:
 - spec/beaker/host/windows_spec.rb
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
-- spec/beaker/hypervisor/docker_spec.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb.orig
-- spec/beaker/hypervisor/openstack_spec.rb
 - spec/beaker/logger_junit_spec.rb
 - spec/beaker/logger_spec.rb
 - spec/beaker/network_manager_spec.rb

data/docs/how_to/hypervisors/docker.md

@@ -1,148 +0,0 @@
-This option allows for testing against Docker containers.
-
-
-### Why?
-
-Using docker as a hypervisor significantly speeds up the provisioning process, as you don't have to spin up an entire VM to run the tests, which has significant overhead.
-
-### How?
-
-So first of all, install Docker using the instructions [here](https://docs.docker.com/installation/#installation).
-
-In the real world, it's generally seen as [bad practice to have sshd running in a Docker container](http://blog.docker.com/2014/06/why-you-dont-need-to-run-sshd-in-docker/). However, for the purpose of a disposable test instance, we're not going to worry about that!
-
-### Basic docker hosts file ###
-The base image to use for the container is named by the image key.
-
-    HOSTS:
-      ubuntu-12-10:
-        platform: ubuntu-12.10-x64
-        image: ubuntu:12.10
-        hypervisor: docker
-    CONFIG:
-      type: foss
-
-### Docker hosts file, with image modification ###
-You can specify extra commands to be executed in order to modify the image with the `docker_image_commands` key.
-
-    HOSTS:
-      ubuntu-12-10:
-        platform: ubuntu-12.10-x64
-        image: ubuntu:12.10
-        hypervisor: docker
-        docker_image_commands:
-          - 'apt-get install -y myapp'
-          - 'myapp --setup'
-    CONFIG:
-      type: foss
-
-### Docker hosts files, with modified start commands ###
-By default the docker container just runs an sshd which is adequate for 'puppet apply' style testing. You can specify a different command to start with the `docker_cmd` key. This gives you scope to run something with more service supervision baked into it, but it is is important that this command starts an sshd listening on port 22 so that beaker can drive the container.
-
-    HOSTS:
-      ubuntu-12-10:
-        platform: ubuntu-12.10-x64
-        image: ubuntu:12.10
-        hypervisor: docker
-        docker_cmd: '["/sbin/init"]'
-    CONFIG:
-      type: foss
-
-### Preserve Docker Image ###
-Unless the image configuration changes you might want to keep the Docker image for multiple spec runs. Use `docker_preserve_image` option for a host.
-
-    HOSTS:
-      ubuntu-12-10:
-        platform: ubuntu-12.10-x64
-        image: ubuntu:12.10
-        hypervisor: docker
-        docker_preserve_image: true
-    CONFIG:
-      type: foss
-
-### Reuse Docker Image ###
-In case you want to rerun the puppet again on the docker container, you can pass BEAKER_provision=no on the command line to set the env. Add this line in you default.ml file
-
-```
-HOSTS:
-  centos6-64:
-    roles:
-     - agent
-    platform: el-6-x86_64
-    image: centos:6.6
-    hypervisor: docker
-CONFIG:
-  type: foss
-  log_level: verbose
-ssh:
-  password: root
-  auth_methods: ["password"]
-```
-
-### Mounting volumes into your docker container ###
-You can mount folders into a docker container:
-
-    HOSTS:
-      ubuntu-12-10:
-        platform: ubuntu-12.10-x64
-        image: ubuntu:12.10
-        hypervisor: docker
-        mount_folders:
-          name1:
-            host_path: host_path1
-            container_path: container_path1
-          name2:
-            host_path: host_path2
-            container_path: container_path2
-            opts: rw
-    CONFIG:
-      type: foss
-
-### Example Output
-
-For this example made a new docker nodeset file in the [puppetlabs-inifile](https://github.com/puppetlabs/puppetlabs-inifile) repo and ran the ini_setting_spec.rb spec:
-
-```bash
-$ bundle exec rspec spec/acceptance/ini_setting_spec.rb
-Hypervisor for debian-7 is docker
-Beaker::Hypervisor, found some docker boxes to create
-Provisioning docker
-provisioning debian-7
-Creating image
-Dockerfile is         FROM debian:7.4
-          RUN apt-get update
-          RUN apt-get install -y openssh-server openssh-client curl ntpdate lsb-release
-        RUN mkdir -p /var/run/sshd
-        RUN echo root:root | chpasswd
-RUN apt-get install -yq lsb-release wget net-tools ruby rubygems ruby1.8-dev libaugeas-dev libaugeas-ruby ntpdate locales-all
-RUN REALLY_GEM_UPDATE_SYSTEM=1 gem update --system --no-ri --no-rdoc
-        EXPOSE 22
-        CMD ["/sbin/init"]
-```
-
-This step may take a while, as Docker will have to download the image. The subsequent runs will be a lot faster (as long as `docker_preserve_image: true` has been enabled).
-
-For example, running this took 5 minutes to download and setup the `debian:7.4` image, but runs instantly the second time.
-
-You should then see something like:
-
-```
-Creating container from image 3a86e5aba94d
-post
-/v1.15/containers/create
-{}
-{"Image":"3a86e5aba94d","Hostname":"debian-7"}
-Starting container b8b31702b34b4aedd137c8a6a72fe730560bb00533e68764ba6263405f9244e4
-post
-/v1.15/containers/b8b31702b34b4aedd137c8a6a72fe730560bb00533e68764ba6263405f9244e4/start
-{}
-{"PublishAllPorts":true,"Privileged":true}
-Using docker server at 192.168.59.103
-get
-/v1.15/containers/b8b31702b34b4aedd137c8a6a72fe730560bb00533e68764ba6263405f9244e4/json
-{}
-
-node available as  ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@192.168.59.103 -p 49155
-```
-
-The tests should then run as normal from there.

data/docs/how_to/hypervisors/openstack.md

@@ -1,166 +0,0 @@
-# Openstack
-
-OpenStack is a free and open-source software platform for cloud computing. [Their Site](http://www.openstack.org/).
-
-Considered **EXPERIMENTAL**, may break without notice.
-
-# Getting Started
-
-### Requirements
-
-Get openstack Access & Security credentials:
-
-- "openstack_api_key"
-- "openstack_auth_url" 
-- "openstack_username"
-- "openstack_tenant"
-- "openstack_network"
-- "openstack_keyname"
-
-If you are using [OpenStack Dashboard "Horizon"] (https://wiki.openstack.org/wiki/Horizon) 
-you can find these keys in next places:
-
-1. login to "Horizon dashboard" -> "project" -> "Compute" -> "Access & Security" -> tab "API Access" -> "Download OpenStack RC File":
-   * "openstack_auth_url" == OS_AUTH_URL + "/tokens"
-   * "openstack_username" == OS_USERNAME
-   * "openstack_tenant" == OS_TENANT_NAME
-2. "openstack_network": in "project" -> "Networks"
-3. "openstack_keyname": in "project" -> "Compute" -> "Access & Security" -> tab "Key Pairs"
-4. "openstack_api_key": Your user Password
-
-### Setup a Openstack Hosts File
-
-An Openstack hosts file looks like a typical hosts file, 
-except that there are a number of required properties that need to be added to every host 
-in order for the Openstack hypervisor to provision hosts properly.
-
-**Basic Openstack hosts file**
-
-    HOSTS:
-      centos-6-master:
-        roles:
-          - master
-          - agent
-          - database
-          - dashboard
-        platform: el-6-x86_64
-        hypervisor: openstack
-        image: centos-6-x86_64-nocm
-        flavor: m1.large
-        
-    CONFIG:
-      nfs_server: none
-      consoleport: 443
-      openstack_api_key: Pas$w0rd
-      openstack_username: user
-      openstack_auth_url: http://10.10.10.10:5000/v2.0/tokens
-      openstack_tenant: testing
-      openstack_network : testing
-      openstack_keyname : nopass
-
-The `image` - image name.
-
-The `flavor` - templates for VMs, defining sizes for RAM, disk, number of cores, and so on.
-
-
-# Openstack-Specific Hosts File Settings
-
-### user-data
-
-"user data" - a blob of data that the user can specify when they launch an instance. 
-The instance can access this data through the metadata service or config drive with one of the next requests:
-
-- curl http://169.254.169.254/2009-04-04/user-data
-- curl http://169.254.169.254/openstack/2012-08-10/user_data
-
-
-Examples of `user_data` you can find here: http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-Also if you plan use `user-data` make sure that 'cloud-init' package installed in your VM `image` and 'cloud-init' service is running.
-
-**Example Openstack hosts file with user_data**
-
-    HOSTS:
-      centos-6-master:
-        roles:
-          - master
-          - agent
-          - database
-          - dashboard
-        platform: el-6-x86_64
-        image: centos-6-x86_64-nocm
-        flavor: m1.large
-        hypervisor: openstack
-        user_data: |
-          #cloud-config
-          bootcmd:
-            - echo 123 > /tmp/test.txt
-    CONFIG:
-      nfs_server: none
-      consoleport: 443
-      openstack_api_key: P1as$w0rd
-      openstack_username: user
-      openstack_auth_url: http://10.10.10.10:5000/v2.0/tokens
-      openstack_tenant: testing
-      openstack_network : testing
-      openstack_keyname : nopass
-
-### Security groups
-
-A security group is a set of rules for incoming and outgoing traffic to 
-an instance.  You can associate a host with one or many security groups
-in the `CONFIG` section of your hosts file:
-
-    security_group: ['my_sg', 'default']
-
-This is an optional config parameter.
-
-### Floating IP Pool
-
-The name of the floating IP pool that a VM can grab IPs from. This is useful
-if your organization doesn't have a public pool of floating IPs, or give each
-user their own pool.  It's used in allocating new IPs.  It's an options
-parameter in the CONFIG section of the host file:
-
-    floating_ip_pool: 'my_pool_name'
-
-### Volumes
-
-Attaching volumes to a VM is supported via the Cinder service.  All versions are transparently
-supported to cater for differences in the APIs.  To create and attach volumes simply add hash
-called 'volumes' to a host in the HOSTS section.  Each key is the name given to the volume upon
-resource creation.  The value is a hash with a single integer parameter 'size' which defines the
-volume size in MB.
-
-**Example OpenStack hosts file with volumes**
-
-    HOSTS:
-      ceph:
-        roles:
-          - master
-        platform: ubuntu-16.04-amd64
-        hypervisor: openstack
-        flavor: m1.large
-        image: xenial-server-cloudimg-amd64-scsi
-        user: ubuntu
-        volumes:
-          osd0:
-            size: 10000
-          osd1:
-            size: 10000
-          osd2:
-            size: 10000
-          journal:
-            size: 1000
-
-
-In the event you're using an OpenStack instance that does not deploy the volume service you can disable that functionality to prevent beaker runs from failing.  Either using an ENV variable or setting the following value in the `CONFIG` section of your hosts file(valid values are `true` or `false`):
-
-```
-openstack_volume_support: false
-```
-
-You can also configure this setting via an environment variable:
-
-```
-export OS_VOLUME_SUPPORT=false