tasks/ci.rake in beaker-puppet-0.11.0 vs tasks/ci.rake in beaker-puppet-0.11.1

- old
+ new

@@ -20,22 +20,21 @@ where <target> is one of: ci:test:git ci:test:aio ci:test:gem - ci:test:quick See `bundle exec rake -D <target>` for information about each target. Each rake task accepts the following environment variables: REQUIRED -------- SHA: The git SHA of either the puppet-agent package or component repo must be specified depending on the target. The `git` and `gem` use the component - SHA, where as `aio` and `quick` use the puppet-agent package SHA. + SHA, where as `aio` uses the puppet-agent package SHA. OPTIONAL -------- HOSTS: @@ -45,12 +44,11 @@ HOSTS=mynodes.yaml HOSTS=redhat7-64ma TESTS: A comma-delimited list of files/directories containing tests to run. - Defaults to running all tests, except for `ci:test:quick` which defaults - to running a predefined set of tests. + Defaults to running all tests. TESTS=tests/cycle_detection.rb TESTS=tests/pluginsync,tests/language OPTIONS: @@ -196,10 +194,11 @@ beaker(:exec, ENV['TESTS']) beaker(:destroy) end def pre_suites(type) - beaker_root = File.dirname(__dir__) + beaker_root = Pathname.new(File.dirname(__dir__)).relative_path_from(Pathname.new(Dir.pwd)) + presuites = case type when :aio [ "#{beaker_root}/setup/common/000-delete-puppet-when-none.rb", "#{beaker_root}/setup/aio/010_Install.rb",