beaker 2.33.0 → 2.34.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjczYWQ4ZGJiZjFhYTY5OTk4M2NhYWFkYjhlNDM5ODkzNzcyNjQ3ZA==
+    NmU2OTY2MTQ3ZWU5Y2U4NDk1ZjRlYTY3MWRiYWZkZmVlMWUyODhlOQ==
   data.tar.gz: !binary |-
-    Mjk2YjRkZDY4M2UxNzhkNDU1MjgyZjgyOTY3NTUwMzgwNmViNTZkZA==
+    ZTlkNzcxYjc0YTMxMzgwODhiOGZhZDQ3Mzg5NjZlNTViMTFkZDI5YQ==
 SHA512:
   metadata.gz: !binary |-
-    MGE4M2I4OGEyNjQ0OTE3NzM4OGUxNTdkZTY5MWIyNGI0MTM2ZWU1ZjYyZDg4
-    YWJiOGFlODZkZTFhZWJkNDBjNmZkNDNlNmRmZTlmN2Y4ODU0NTNhMmEyZjBl
-    Mjk5MjAwM2UzMmQzZDE2M2Q4NGZiYjNkOTZmZWJlNWZlNGZhYjg=
+    MmI5N2ViNjA2MWU4M2VkNzJlNzJhMjU5NWFjMGJjNTM2ZTI4MGU4Mzc5YWEx
+    OGVkMjM1NDlhOGI1Y2Q0OTYwNjBiNGQ3NWE1Nzg2M2IxNmJmM2NhYzNjOWU4
+    MzRlNGVmZDkwNWFlYTFmODM4NTAyY2RmZjkyNmYxNDQ3MjY3MmE=
   data.tar.gz: !binary |-
-    Mjk2NjFlNzYxNjA5YzY2NWZiYjdjZWJiZGEzNWM2YzhiZGIyYmNiNDlkNDQ1
-    NzhiNDZiOTk4ZmU2M2RmMDA1NWRlZGY1MGQzNjhmZWFlNDMzOWY2NjVhMTZj
-    YmM4MDYyZWEwMTdiNGVmM2JjNGQ0MjcxMjQyMjdkMzg4OGZlMjY=
+    MWU3MmI2ZjM0OWQ4M2M3NTQ1OTg4MTcyYTg0Nzc1MjBjMGQzZjdkZWVhN2Fm
+    NDkxMjJjNjg3NWVmZTQzMWRmZTBjOTgyMWU3YWY3ODM1YmQ4YjY4N2ExNGE0
+    ZDVjMjRiZGVhODU2MDBiMWU4Y2FmY2Y4YmQ2N2U5ZTllYWVmYjE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 27 Jan, 2016 (abf7e410)](#LATEST)
+* [LATEST - 10 Feb, 2016 (78b7dd79)](#LATEST)
+* [2.33.0 - 27 Jan, 2016 (0dd8505a)](#2.33.0)
 * [2.32.1 - 14 Jan, 2016 (8c394fdb)](#2.32.1)
 * [2.32.0 - 12 Jan, 2016 (80e153cc)](#2.32.0)
 * [2.31.0 - 16 Dec, 2015 (54b1801d)](#2.31.0)
@@ -108,7 +109,177 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 27 Jan, 2016 (abf7e410)
+### <a name = "LATEST">LATEST - 10 Feb, 2016 (78b7dd79)
+
+* (GEM) update beaker version to 2.34.0 (78b7dd79)
+
+* Merge pull request #1064 from kevpl/maint_cisco_docadd (ecdbafbc)
+
+
+```
+Merge pull request #1064 from kevpl/maint_cisco_docadd
+
+(MAINT) added cisco platform doc
+```
+* Merge pull request #1062 from kevpl/bkr667_cisco7_provision (1b662ddf)
+
+
+```
+Merge pull request #1062 from kevpl/bkr667_cisco7_provision
+
+(BKR-667) added wrlinux7 provisioning support
+```
+* (MAINT) added cisco platform doc (8ffb6f07)
+
+* Merge pull request #1056 from objectverbobject/BKR-513 (3bc8c548)
+
+
+```
+Merge pull request #1056 from objectverbobject/BKR-513
+
+Revert "(BKR-358) get ubuntu 15.04 builds green"
+```
+* Merge pull request #1055 from cowofevil/doc/master/update_readme (3c7d6fdc)
+
+
+```
+Merge pull request #1055 from cowofevil/doc/master/update_readme
+
+(MAINT) Add README Information for Beaker Libraries
+```
+* (BKR-667) refactor cisco specific code into its own host object (eadc206c)
+
+* Merge pull request #1061 from kevpl/bkr695_puppetconf_windows (eae84239)
+
+
+```
+Merge pull request #1061 from kevpl/bkr695_puppetconf_windows
+
+(BKR-695) fix configure_puppet_on for windows
+```
+* Merge pull request #1051 from kevpl/bkr668_wrlinux5_puppetagentinstall (52ad675d)
+
+
+```
+Merge pull request #1051 from kevpl/bkr668_wrlinux5_puppetagentinstall
+
+(BKR-668) wrlinux5 puppet-agent install support added
+```
+* Merge pull request #1058 from Iristyle/maint/fix-windows-user_list (6260d231)
+
+
+```
+Merge pull request #1058 from Iristyle/maint/fix-windows-user_list
+
+(maint) Fix Windows user_list functionality
+```
+* (BKR-695) fix configure_puppet_on for windows (27661d96)
+
+* (maint) Fix Windows user_list functionality (fe15bcfe)
+
+
+```
+(maint) Fix Windows user_list functionality
+
+ - Existing functionality used an overly restrictive regex that didn't
+   account for characters like - or . in Windows user names, which are
+   completely valid.
+
+   Use a less restrictive regex to capture the value correctly.  The
+   results of wmic always include the username immediately after the
+   = in the Name= string
+```
+* Revert "(BKR-358) get ubuntu 15.04 builds green" (53cfea20)
+
+
+```
+Revert "(BKR-358) get ubuntu 15.04 builds green"
+
+This reverts commit 9d400ef4e08aa89f6174af7fdef3c6b160fbe620.
+```
+* Merge pull request #1053 from nhemingway/neilh/BKR-637-docker-volumes (d4da4aaa)
+
+
+```
+Merge pull request #1053 from nhemingway/neilh/BKR-637-docker-volumes
+
+(BKR-637) Support mounting volumes with docker
+```
+* Merge pull request #1054 from er0ck/task/master/move_recipes_from_confluence (ad8122f3)
+
+
+```
+Merge pull request #1054 from er0ck/task/master/move_recipes_from_confluence
+
+(maint) move recipes from confluence
+```
+* Merge pull request #1052 from samwoods1/teardown_info_log (a640b3f6)
+
+
+```
+Merge pull request #1052 from samwoods1/teardown_info_log
+
+Add info log when teardown begins
+```
+* (BKR-668) used specific command to set env var for cisco-5 (7308c4ff)
+
+* (BKR-668) fixed non-root SCP issue for cisco-5 (c5913ac0)
+
+* (MAINT) Add README Information for Beaker Libraries (bd9619c3)
+
+
+```
+(MAINT) Add README Information for Beaker Libraries
+
+Update the Beaker docs README to point to the public Beaker libraries.
+```
+* (maint) move recipes from confluence (26af5654)
+
+
+```
+(maint) move recipes from confluence
+
+This change adds a document containing some recipes for solving common
+problems with Beaker.  It is currently housed on confluence.
+```
+* (BKR-668) fixed SCP to root owned files for cisco-5 (b2dd3185)
+
+* (BKR-637) Rename options to be clearer (8b8f2ce4)
+
+* (BKR-637) Support mounting volumes with docker (aa2847ed)
+
+* (BKR-668) dealt with on / puppet issue (details below): (f78c2db4)
+
+
+```
+(BKR-668) dealt with on / puppet issue (details below):
+
+if you executed this code
+
+    on( host, puppet( 'status' ) )
+
+on a cisco host, you would get double prefixing.  Thats because if
+you pass the  method a Beaker::Command object, it would reverse
+it to the command string & re-build the Command object again. This
+change makes it so that if a Command object is passed, it gets used,
+since the reason for creating a Command object is to pass in other
+arguments youd like to be a part of execution.
+```
+* (BKR-667) added wrlinux7 provisioning support (bb06c9a4)
+
+* (MAINT) Add info log when teardown begins (d24f5b47)
+
+* (BKR-668) guarding against 'vsh' usage on cisco platforms (3e1d7690)
+
+* (BKR-668) install_puppet_agent_dev_repo_on support added for cisco-5 (a6f3c67d)
+
+* (BKR-668) refactored host-based commands into host objects (f548df7b)
+
+* (BKR-668) install_puppet_agent_on cisco-5 support added (0ab82acb)
+
+### <a name = "2.33.0">2.33.0 - 27 Jan, 2016 (0dd8505a)
+
+* (HISTORY) update beaker history for gem release 2.33.0 (0dd8505a)
 
 * (GEM) update beaker version to 2.33.0 (abf7e410)
 

data/README.md

@@ -10,6 +10,11 @@ See [Beaker Installation](https://github.com/puppetlabs/beaker/wiki/Beaker-Insta
 
 Documentation for Beaker can be found in this repository in [the docs/ folder](docs/README.md).
 
+#Beaker Libraries
+
+Beaker functionality has been extended through the use of libraries available as gems. See the
+[complete list](docs/Beaker-Libraries.md) for more details.
+
 #Beaker API
 
 [RubyDoc Beaker Documentation Server](http://rubydoc.info/github/puppetlabs/beaker/frames)

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

@@ -16,11 +16,6 @@ end
 
 test_name "dsl::helpers::host_helpers #check_for_package" do
 
-  # NOTE: vivid packages are not ready on nightlies.puppetlabs.com,
-  #       see:  https://tickets.puppetlabs.com/browse/CPR-173
-  #       also: https://tickets.puppetlabs.com/browse/BKR-513
-  confine :except, :platform => /ubuntu.*15/
-
   # NOTE: there does not appear to be a way to confine just to cygwin hosts
   confine_block :to, :platform => /windows/ do
 

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

@@ -1,10 +1,6 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #install_package" do
-  # NOTE: vivid packages are not ready on nightlies.puppetlabs.com,
-  #       see:  https://tickets.puppetlabs.com/browse/CPR-173
-  #       also: https://tickets.puppetlabs.com/browse/BKR-513
-  confine :except, :platform => /ubuntu.*15/
 
   # NOTE: there does not appear to be a way to confine just to cygwin hosts
   confine_block :to, :platform => /windows/ do

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

@@ -1,10 +1,6 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #upgrade_package" do
-  # NOTE: vivid packages are not ready on nightlies.puppetlabs.com,
-  #       see:  https://tickets.puppetlabs.com/browse/CPR-173
-  #       also: https://tickets.puppetlabs.com/browse/BKR-513
-  confine :except, :platform => /ubuntu.*15/
 
   # NOTE: there does not appear to be a way to confine just to cygwin hosts
   confine_block :to, :platform => /windows/ do

data/docs/Beaker-Libraries.md

@@ -0,0 +1,8 @@
+# Beaker Libraries
+The QA team at Puppet Labs has written several libraries that extends the functionality provided
+by Beaker.
+
+| Name               | Description                                                         | Docs                                                            |
+|:-------------------|:--------------------------------------------------------------------|:----------------------------------------------------------------|
+| Master Manipulator | A Beaker library for changing configuration on a Puppet Master      | [Github Repo](https://github.com/puppetlabs/master_manipulator) |
+| beaker_windows     | A Beaker library that provides helpers for testing on Windows hosts | [Github Repo](https://github.com/puppetlabs/beaker_windows)     |

data/docs/Beaker-Recipes.md

@@ -0,0 +1,13 @@
+# What is This?
+
+Patterns for best-use solutions to (not so) common problems
+
+## How do i set persistent environment variables on a SUT, such as PATH?
+    host.add_env_var('PATH', '/opt/puppetlabs/bin:$PATH')
+
+## How do i run commands on a SUT as a non-root user?
+(warning) this should be abstracted into a beaker helper, or part of on():   BKR-168 - Beaker::DSL::Helpers needs "as" method READY FOR ENGINEERING
+
+###create the user, then su with --command:
+    on(host, puppet("resource user #{username} ensure=present managehome-true"))
+    on(host, "su #{username} --command '#{command}'")

data/docs/Docker-Support.md

@@ -79,6 +79,25 @@ ssh:
   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:

data/docs/README.md

@@ -30,8 +30,10 @@
   * [Let's Write a Test!](Lets-Write-a-Test.md)
   * [Access The Live Test Console with Pry](Access-the-Live-Test-Console-with-Pry.md)
   * [Test Tagging](Beaker-Test-Tagging.md)
+  * [Recipes](Beaker-Recipes.md)
 * [Beaker vs. Beaker-rspec](beaker-vs.-beaker-rspec.md)
 * [How to Write a Beaker Test for a Module Using beaker-rspec](How-to-Write-a-Beaker-Test-for-a-Module.md)
+* [Beaker Libraries](Beaker-Libraries.md)
 
 ## Other Resources
 

data/docs/hosts/cisco.md

@@ -0,0 +1,60 @@
+# Wind River Linux
+
+Wind River Linux is an embedded systems OS from Wind, an Intel Company.  You
+can get more details on this from their
+[product page](http://www.windriver.com/products/linux/).
+
+Wind River Linux support came to Beaker through testing Cisco network
+devices, so our platform codename for this OS is `cisco`.
+
+Beaker currently can install puppet on WRLinux NXOS (5) and EXR (7).
+
+# Host Requirements
+
+WRLinux hosts validate their setup once created, and will fail if not
+setup correctly.  There are two conditions that are validated specifically
+on WRLinux hosts.  These conditions are listed below.
+
+A. All WRLinux hosts will need a `:vrf` value, which determines their
+virtual routing framework for networking purposes.  For our purposes,
+we tend to use the value `management`, so there is always a hosts
+file line that looks like this in our configuration:
+
+    HOSTS:
+      <hostname>:
+        ...
+        vrf: management
+    
+B. WRLinux NXOS (5) hosts will also require a user to be set on the
+hosts.  This is because they don't allow ssh'ing as the root user,
+which is one of the main assumptions that Beaker operates under in
+the usual case.  In order to specify a user to ssh with, add this
+block to a host:
+
+    HOSTS:
+      <hostname>:
+        ...
+        ssh:
+          user: <username>
+
+# Hypervisors
+
+WRLinux has only been developed and tested as a
+[vmpooler](https://github.com/puppetlabs/vmpooler) host.
+
+This doesn't mean that it can't be used in another hypervisor, but that
+Beaker doesn't specifically deal with the details of that hypervisor in creating
+WRLinux hosts, if there is anything specific to WRLinux that will need to be done in
+provisioning steps.
+
+# Installation Methods
+
+## Open Source
+
+In order to install a puppet-agent against a WRLinux host, you'll have to use the
+[`install_puppet_agent_on`](blob/master/lib/beaker/dsl/install_utils/foss_utils.rb#L327)
+method.
+
+It reaches out to the WRLinux-specific host code for any information that it needs.
+You can check out [these methods](blob/master/lib/beaker/host/cisco.rb) if you
+need more information about this.

data/docs/hosts/eos.md

@@ -3,7 +3,7 @@
 EOS is the network device OS from Arista. You can get more details from their
 [product page](https://www.arista.com/en/products/eos).
 
-# Supported Hypervisors
+# Hypervisors
 
 EOS has only been developed and tested as a
 [vmpooler](https://github.com/puppetlabs/vmpooler) host.
@@ -13,7 +13,7 @@ Beaker doesn't specifically deal with the details of that hypervisor in creating
 EOS hosts, if there is anything specific to EOS that will need to be done in
 provisioning steps.
 
-# Supported Installation Methods
+# Installation Methods
 
 ## Puppet Enterprise
 

data/lib/beaker/command.rb

@@ -70,12 +70,12 @@ module Beaker
     #
     # @return [String] This returns the fully formed command line invocation.
     def cmd_line host, cmd = @command, env = @environment, pc = @prepend_cmds
-      env_string = env.nil? ? '' : environment_string_for( host, env )
-
-      cygwin = ((host['platform'] =~ /windows/) and host.is_cygwin? and @cmdexe) ? 'cmd.exe /c' : nil
+      env_string = host.environment_string( env )
+      prepend_commands = host.prepend_commands( cmd, pc, :cmd_exe => @cmdexe )
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      [env_string, cygwin, pc, cmd, options_string, args_string].compact.reject(&:empty?).join(' ')
+      cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string]
+      cmd_line_array.compact.reject( &:empty? ).join( ' ' )
     end
 
     # @param [Hash] opts These are the options that the command takes
@@ -120,48 +120,7 @@ module Beaker
       args.flatten.compact.join(' ')
     end
 
-    # Construct the environment string for this command
-    #
-    # @param [Host]                 host  A Host object
-    # @param [Hash{String=>String}] env   An optional Hash containing
-    #                                     key-value pairs to be treated
-    #                                     as environment variables that
-    #                                     should be set for the duration
-    #                                     of the puppet command.
-    #
-    # @return [String] Returns a string containing command line arguments that
-    #                  will ensure the environment is correctly set for the
-    #                  given host.
-    #
-    # @note I dislike the principle of this method. There is host specific
-    #       knowledge contained here. Really the relationship should be
-    #       reversed where a host is asked for an appropriate Command when
-    #       given a generic Command.
-    def environment_string_for host, env
-      return '' if env.empty?
-      env_array = []
-      env.each_key do |key|
-        val = env[key]
-        if val.is_a?(Array)
-          val = val.join(':')
-        else
-          val = val.to_s
-        end
-        env_array << "#{key.to_s.upcase}=\"#{val}\""
-      end
 
-      if not host.is_powershell?
-        environment_string = env_array.join(' ')
-        "env #{environment_string}"
-      else
-        environment_string = ''
-        env_array.each_with_index do |env|
-          environment_string += "set #{env} && "
-        end
-        environment_string
-      end
-
-    end
 
   end