From ddae40badeec8dd69facca06582e273bb3c2ed60 Mon Sep 17 00:00:00 2001 From: Spencer McElmurry Date: Mon, 27 Nov 2017 15:55:33 -0800 Subject: [PATCH] (maint) Add option for BEAKER_HOSTS file to be pregenerated in acceptance tests Before, the host configuration was hard-coded. Added an option to specify an ENV var in order to use a different string or a pregenerated hostfile. This also allows us to use abs in production, so that has been added to the Gemfile --- Gemfile | 1 + Rakefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9604bb0..0f6f8d9 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ end # don't want to create a transitive dependency group :acceptance_testing do gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.0') + gem "beaker-abs", *location_for(ENV['ABS_VERSION'] || '~> 0.3.0') end diff --git a/Rakefile b/Rakefile index d334139..32b6495 100644 --- a/Rakefile +++ b/Rakefile @@ -20,11 +20,12 @@ Runs the base beaker acceptance test using the hypervisor library beaker_gem_spec = Gem::Specification.find_by_name('beaker') beaker_gem_dir = beaker_gem_spec.gem_dir beaker_test_base_dir = File.join(beaker_gem_dir, 'acceptance/tests/base') + beaker_hosts = ENV['BEAKER_HOSTS'] || 'redhat7-64af-64default.mdcal' load_path_option = File.join(beaker_gem_dir, 'acceptance/lib') sh("beaker", "--tests", beaker_test_base_dir, "--log-level", "verbose", - "--hosts", "redhat7-64af-redhat7-64default.mdcal", + "--hosts", beaker_hosts, "--load-path", load_path_option, "--keyfile", ENV['KEY'] || "#{ENV['HOME']}/.ssh/id_rsa-acceptance") end