beaker 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA512: 
-  data.tar.gz: 57e9508cea8ac335f9d67bd3dab67a76df031b9b6c9e47e2f674446976b2e135a9e3b5d3aaa7ad1de142e5a254c27c714639a2a4ecc56a98ebc6c8914f9b2798
-  metadata.gz: 7e5c4415ae77f26189b861d6332868284e5a7d8bee1e221961d8887858901efe8f9b23f74d2b9818fb66816cd418ccc12fe8c902b078c0db2cff36a23bbfabd5
-SHA1: 
-  data.tar.gz: 53f6a4f5809c8c7e64c71907127992763dad9108
-  metadata.gz: d738e6e7d4c974cd295f3c2130f86c118423aef5
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTAxN2IzZDYzNjNjM2E0NjhjZDVjNmE1OWQ2YmZkNWY2MDE5MGNiMg==
+  data.tar.gz: !binary |-
+    OGRjYjFhOWYxNjI5MTc2NDc3NTNlZjEyNGFkMTZmYmUxZmRkZjVhZg==
+SHA512:
+  metadata.gz: !binary |-
+    YWUwMDIzZTc4MDM5MjlhY2M4ZmVkZGE3ZjIzYWVjNzk2YmEyZjZjMjRiZjdm
+    YTQzMTU4Njg3ZDQzNDMxMDk1NDY3NDdjZWY1NTZjMjA4ZDA2OTk4ZWE5Yzk5
+    MjY0Y2JjNjcxMWZlNDZhZmZlNGVkM2FiMDBhMTIzYjY2OGZmOTE=
+  data.tar.gz: !binary |-
+    NjA0MzQwMjE2YmZiZDQ1YTZhMTUwZWU5Yjk1MjFlMWNjN2EzMzg3MzJlZmQ2
+    OTZkMjBkYTEwM2E3MTFjMTRkMDJiMjUwMGU0ZTAxZWVhZTcwNWVjMDUwNDNh
+    MDE2YzNlNzQ2ZWIzMzJkMjY3MTVlYzczZWE0MjEzYTYzZjNlMTU=

data/lib/beaker/answers.rb

@@ -1,4 +1,4 @@
-[ 'version32', 'version30', 'version28', 'version20' ].each do |lib|
+[ 'version34', 'version32', 'version30', 'version28', 'version20' ].each do |lib|
   require "beaker/answers/#{lib}"
 end
 
@@ -21,6 +21,8 @@ module Beaker
     def self.answers(version, hosts, master_certname, options)
 
       case version
+      when /\A3\.4/
+        Version34.answers(hosts, master_certname, options)
       when /\A3\.[2-3]/
         Version32.answers(hosts, master_certname, options)
       when /\A3\.1/

data/lib/beaker/answers/version34.rb

@@ -0,0 +1,12 @@
+require 'beaker/answers/version32'
+
+module Beaker
+  module Answers
+    module Version34
+      def self.answers(hosts, master_certname, options)
+        the_answers = Version32.answers(hosts, master_certname, options)
+        return the_answers
+      end
+    end
+  end
+end

data/lib/beaker/cli.rb

@@ -15,6 +15,7 @@ module Beaker
       @options = @options_parser.parse_args
       @logger = Beaker::Logger.new(@options)
       @options[:logger] = @logger
+      @options[:timestamp] = @timestamp
       @execute = true
 
       if @options[:help]

data/lib/beaker/dsl.rb

@@ -1,5 +1,5 @@
 [ 'install_utils', 'roles', 'outcomes', 'assertions',
-  'structure', 'helpers', 'wrappers' ].each do |lib|
+  'structure', 'helpers', 'ezbake_utils', 'wrappers' ].each do |lib|
   require "beaker/dsl/#{lib}"
 end
 
@@ -76,6 +76,7 @@ module Beaker
     include Beaker::DSL::Assertions
     include Beaker::DSL::Wrappers
     include Beaker::DSL::Helpers
+    include Beaker::DSL::EZBakeUtils
     include Beaker::DSL::InstallUtils
   end
 end

data/lib/beaker/dsl/ezbake_utils.rb

@@ -0,0 +1,220 @@
+require 'beaker/dsl/install_utils'
+
+module Beaker
+  module DSL
+    #
+    # This module contains methods to assist in installing projects from source
+    # that use ezbake for packaging.
+    #
+    # @api dsl
+    module EZBakeUtils
+
+      REMOTE_PACKAGES_REQUIRED = ['make']
+      LOCAL_COMMANDS_REQUIRED = [
+        ['leiningen', 'lein --version', nil],
+        ['lein-pprint', 'lein with-profile ci pprint :version', 
+          'Must have lein-pprint installed under the :ci profile.'],
+        ['java', 'java -version', nil],
+        ['git', 'git --version', nil],
+        ['rake', 'rake --version', nil],
+      ]
+      class << self
+        attr_accessor :config
+      end
+
+      # Return the ezbake config.
+      #
+      def ezbake_config
+        EZBakeUtils.config
+      end
+
+      # Checks given host for the tools necessary to perform
+      # install_from_ezbake. If no host is given then check the local machine
+      # for necessary available tools. If a tool is not found, then raise
+      # RuntimeError.
+      #
+      def ezbake_tools_available? host = nil
+        if host
+          REMOTE_PACKAGES_REQUIRED.each do |package_name|
+            if not check_for_package host, package_name
+              raise "Required package, #{package_name}, not installed on #{host}" 
+            end
+          end
+        else
+          LOCAL_COMMANDS_REQUIRED.each do |software_name, command, additional_error_message|
+            if not system command
+              error_message = "Must have #{software_name} installed on development system.\n"
+              if additional_error_message
+                error_message += additional_error_message
+              end
+              raise error_message
+            end
+          end
+        end
+      end
+
+      # Prepares a staging directory for the specified project.
+      #
+      # @param [String] project_name The name of the ezbake project being worked
+      #                              on.
+      # @param [String] project_version The desired version of the primary
+      #                                 subproject being worked.
+      # @param [String] ezbake_dir The local directory where the ezbake project
+      #                            resides or should reside if it doesn't exist
+      #                            already.
+      #
+      def ezbake_stage project_name, project_version, ezbake_dir="tmp/ezbake"
+        ezbake_tools_available?
+        conditionally_clone "git@github.com:puppetlabs/ezbake.git", ezbake_dir
+
+        package_version = ''
+        Dir.chdir(ezbake_dir) do
+          `lein run -- stage #{project_name} #{project_name}-version=#{project_version}`
+        end
+
+        staging_dir = File.join(ezbake_dir, 'target/staging')
+        Dir.chdir(staging_dir) do
+          output = `rake package:bootstrap`
+          load 'ezbake.rb'
+          ezbake = EZBake::Config
+          ezbake[:package_version] = `echo -n $(rake pl:print_build_param[ref] | tail -n 1)`
+          EZBakeUtils.config = ezbake
+        end
+      end
+
+      # Installs ezbake dependencies on given host.
+      #
+      # @param [Host] host A single remote host on which to install the
+      # packaging dependencies of the ezbake project configuration currently in
+      # Beaker::DSL::EZBakeUtils.config
+      #
+      def install_ezbake_deps host
+        ezbake_tools_available? host
+
+        if not ezbake_config
+          ezbake_stage project_name, project_version
+        end
+
+        variant, version, arch, codename = host['platform'].to_array
+        ezbake = ezbake_config
+
+        case variant
+        when /^(fedora|el|centos)$/
+          dependency_list = ezbake[:redhat][:additional_dependencies]
+          dependency_list.each do |dependency|
+            package_name, _, package_version = dependency.split
+            install_package host, package_name, package_version
+          end
+
+        when /^(debian|ubuntu)$/
+          dependency_list = ezbake[:debian][:additional_dependencies]
+          dependency_list.each do |dependency|
+            package_name, _, package_version = dependency.split
+            if package_version
+              package_version = package_version.chop
+            end
+            install_package host, package_name, package_version
+          end
+
+        else
+          raise "No repository installation step for #{variant} yet..."
+        end
+
+      end
+
+      # Installs leiningen project with given name and version on remote host.
+      #
+      # @param [Host] host A single remote host on which to install the
+      # specified leiningen project.
+      # @param [String] project_name The name of the project. In ezbake context
+      # this is the name of both a subdirectory of the ezbake_dir/configs dir
+      # and the name of the .clj file in that directory which contains the
+      # project map used by ezbake to create the staging directory.
+      # @param [String] project_version The version of the project specified by
+      # project_name which is to be built and installed on the remote host.
+      # @param [String] ezbake_dir The directory to which ezbake should be
+      # cloned; alternatively, if ezbake is already at that directory, it will
+      # be updated from its github master before any ezbake operations are
+      # performed.
+      #
+      def install_from_ezbake host, project_name, project_version, env_args={}, ezbake_dir='tmp/ezbake'
+        ezbake_tools_available? host
+
+        if not ezbake_config
+          ezbake_stage project_name, project_version
+        end
+
+        variant, _, _, _ = host['platform'].to_array
+
+        case variant
+        when /^(osx|windows|solaris|aix)$/
+          raise "Beaker::DSL::EZBakeUtils unsupported platform: #{variant}"
+        end
+
+        ezbake = ezbake_config
+        project_package_version = ezbake[:package_version]
+        project_name = ezbake[:project]
+
+        ezbake_staging_dir = File.join(ezbake_dir, "target/staging")
+
+        remote_tarball = ""
+        local_tarball = ""
+        dir_name = ""
+
+        Dir.chdir(ezbake_staging_dir) do
+          output = `rake package:tar`
+
+          pattern = "%s-%s"
+          dir_name = pattern % [
+            project_name,
+            project_package_version
+          ]
+          local_tarball = "./pkg/" + dir_name + ".tar.gz"
+          remote_tarball = "/root/" +  dir_name + ".tar.gz"
+
+          scp_to host, local_tarball, remote_tarball
+        end
+
+        # untar tarball on host
+        on host, "tar -xzf " + remote_tarball
+
+        # "make" on target
+        cd_to_package_dir = "cd /root/" + dir_name + "; "
+        env = ""
+        if not env_args.empty?
+          env = "env " + env_args.map {|k, v| "#{k}=#{v} "}.join(' ')
+        end
+        on host, cd_to_package_dir + env + "make -e install-" + project_name
+
+        # install init scripts and default settings, perform additional preinst
+        # TODO: figure out a better way to install init scripts and defaults
+        case variant
+          when /^(fedora|el|centos)$/
+            env += "defaultsdir=/etc/sysconfig "
+            on host, cd_to_package_dir + env + "make -e install-rpm-sysv-init"
+          when /^(debian|ubuntu)$/
+            env += "defaultsdir=/etc/default "
+            on host, cd_to_package_dir + env + "make -e install-deb-sysv-init"
+          else
+            raise "No ezbake installation step for #{variant} yet..."
+        end
+      end
+
+      # Only clone from given git URI if there is no existing git clone at the
+      # given local_path location.
+      #
+      # @!visibility private
+      def conditionally_clone(upstream_uri, local_path)
+        ezbake_tools_available?
+        if system "git --work-tree=#{local_path} --git-dir=#{local_path}/.git status"
+          system "git --work-tree=#{local_path} --git-dir=#{local_path}/.git pull"
+        else
+          parent_dir = File.dirname(local_path)
+          FileUtils.mkdir_p(parent_dir)
+          system "git clone #{upstream_uri} #{local_path}"
+        end
+      end
+
+    end
+  end
+end

data/lib/beaker/dsl/helpers.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'resolv'
 require 'inifile'
 require 'timeout'
@@ -23,6 +24,9 @@ module Beaker
     #
     # @api dsl
     module Helpers
+
+      PUPPET_MODULE_INSTALL_IGNORE = ['.git', '.idea', '.vagrant', '.vendor', 'acceptance', 'spec', 'tests', 'log']
+
       # @!macro common_opts
       #   @param [Hash{Symbol=>String}] opts Options to alter execution.
       #   @option opts [Boolean] :silent (false) Do not produce log output
@@ -221,8 +225,8 @@ module Beaker
       # @param [String] package_name   Name of the package to install
       #
       # @return [Result]   An object representing the outcome of *install command*.
-      def install_package host, package_name
-        host.install_package package_name
+      def install_package host, package_name, package_version = nil
+        host.install_package package_name, '', package_version
       end
 
       # Upgrade a package on a host. The package must already be installed
@@ -345,8 +349,8 @@ module Beaker
       # @option opts [String] :source The location on the test runners box where the files are found
       # @option opts [String] :module_name The name of the module to be copied over
       def puppet_module_install_on(host, opts = {})
-        Array(host).each do |host|
-          scp_to host, opts[:source], File.join(host['distmoduledir'], opts[:module_name])
+        Array(host).each do |h|
+          on h, puppet("module install #{opts[:module_name]}")
         end
       end
 
@@ -522,12 +526,15 @@ module Beaker
         cmdline_args = conf_opts[:__commandline_args__]
         conf_opts = conf_opts.reject { |k,v| k == :__commandline_args__ }
 
+        curl_retries = host['master-start-curl-retries'] || options['master-start-curl-retries']
+        logger.debug "Setting curl retries to #{curl_retries}"
+
         begin
           backup_file = backup_the_file(host, host['puppetpath'], testdir, 'puppet.conf')
           lay_down_new_puppet_conf host, conf_opts, testdir
 
           if host['puppetservice']
-            bounce_service( host, host['puppetservice'] )
+            bounce_service( host, host['puppetservice'], curl_retries )
           else
             puppet_master_started = start_puppet_from_source_on!( host, cmdline_args )
           end
@@ -543,7 +550,7 @@ module Beaker
             restore_puppet_conf_from_backup( host, backup_file )
 
             if host['puppetservice']
-              bounce_service( host, host['puppetservice'] )
+              bounce_service( host, host['puppetservice'], curl_retries )
             else
               if puppet_master_started
                 stop_puppet_from_source_on( host )
@@ -681,14 +688,12 @@ module Beaker
       end
 
       # @!visibility private
-      def bounce_service host, service
+      def bounce_service host, service, curl_retries = 120
         # Any reason to not
         # host.exec puppet_resource( 'service', service, 'ensure=stopped' )
         # host.exec puppet_resource( 'service', service, 'ensure=running' )
         host.exec( Command.new( "#{host['service-prefix']}#{service} restart" ) )
-        if host['service-wait']
-          curl_with_retries(" #{service} ", host, "http://localhost:8140", [0, 52], 120)
-        end
+        curl_with_retries(" #{service} ", host, "https://localhost:8140", [35, 60], curl_retries)
       end
 
       # Blocks until the port is open on the host specified, returns false
@@ -1135,7 +1140,7 @@ module Beaker
       end
 
 
-      #Install local module for acceptance testing
+      # Install local module for acceptance testing
       # should be used as a presuite to ensure local module is copied to the hosts you want, particularly masters
       # @api dsl
       # @param [Host, Array<Host>, String, Symbol] host
@@ -1148,38 +1153,26 @@ module Beaker
       #                   Name which the module should be installed under, please do not include author,
       #                     if none is provided it will attempt to parse the metadata.json and then the Modulefile to determine
       #                     the name of the module
-      # @option opts [String] :target_module_path (host['puppetpath']/modules)
+      # @option opts [String] :target_module_path (host['distmoduledir']/modules)
       #                   Location where the module should be installed, will default
-      #                    to host['puppetpath']/modules
+      #                    to host['distmoduledir']/modules
+      # @option opts [Array] :ignore_list
       # @raise [ArgumentError] if not host is provided or module_name is not provided and can not be found in Modulefile
       #
-      def copy_root_module_to(host, opts = {})
-        if !host
-          raise(ArgumentError, "Host must be defined")
-        end
-        source = opts[:source] || parse_for_moduleroot(Dir.getwd)
-        target_module_path = opts[:target_module_path] || "#{host['puppetpath']}/modules"
-
-        module_name = opts[:module_name] || parse_for_modulename(source)
-        if !module_name
-          logger.debug('Still unable to determine the modulename')
-          raise(ArgumentError, "Unable to determine the module name, please update your call of puppet_module_install")
-        end
-
-        module_dir = File.join(target_module_path, module_name)
-        on host, "mkdir -p #{target_module_path}"
-        ['manifests', 'lib', 'templates', 'metadata.json', 'Modulefile', 'files', 'Gemfile'].each do |item|
-          item_source = File.join(source, item)
-          if File.exists? item_source
-            options = {}
-            if File.directory? item_source
-              on host, "mkdir -p #{File.join(module_dir, item)}"
-              options = { :mkdir => true }
-            end
-            host.do_scp_to(item_source, module_dir, options)
-          end
+      def copy_module_to(host, opts = {})
+        opts = {:source => './',
+                :target_module_path => host['distmoduledir'],
+                :ignore_list => PUPPET_MODULE_INSTALL_IGNORE}.merge(opts)
+        ignore_list = build_ignore_list(opts)
+        target_module_dir = opts[:target_module_path]
+        if opts.has_key?(:module_name)
+          module_name = opts[:module_name]
+        else
+          module_name = parse_for_modulename(opts[:source])
         end
+        scp_to host, File.join(opts[:source]), File.join(target_module_dir, module_name), {:ignore => ignore_list}
       end
+      alias :copy_root_module_to :copy_module_to
 
 
       #Recursive method for finding the module root
@@ -1253,6 +1246,22 @@ module Beaker
         end
       end
 
+      # Build an array list of files/directories to ignore when pushing to remote host
+      # Automatically adds '..' and '.' to array.  If not opts of :ignore list is provided
+      # it will use the static variable PUPPET_MODULE_INSTALL_IGNORE
+      #
+      # @param opts [Hash]
+      # @option opts [Array] :ignore_list A list of files/directories to ignore
+      def build_ignore_list(opts = {})
+        ignore_list = opts[:ignore_list] || PUPPET_MODULE_INSTALL_IGNORE
+        if !ignore_list.kind_of?(Array) || ignore_list.nil?
+          raise ArgumentError "Ignore list must be an Array"
+        end
+        ignore_list << '.' unless ignore_list.include? '.'
+        ignore_list << '..' unless ignore_list.include? '..'
+        ignore_list
+      end
+
     end
   end
 end