From d4059b6857f29fdd2d1fef0e08ee65dac5c56547 Mon Sep 17 00:00:00 2001 From: Hailee Kenney Date: Mon, 6 Oct 2014 14:58:15 -0700 Subject: [PATCH] (PDOC-9) Update acceptance take task for Jenkins In order to allow for multiple platforms on Jenkins, use the platform environment variable in the rake task for acceptance tests to determine which platform to run on. --- Rakefile | 2 +- spec/acceptance/nodesets/{default.yml => fedora20.yml} | 0 spec/acceptance/running_strings_yardoc.rb | 4 +--- 3 files changed, 2 insertions(+), 4 deletions(-) rename spec/acceptance/nodesets/{default.yml => fedora20.yml} (100%) diff --git a/Rakefile b/Rakefile index 061eeb9..e648b48 100644 --- a/Rakefile +++ b/Rakefile @@ -20,5 +20,5 @@ end task :acceptance do sh "puppet module build" sh "puppet module build spec/unit/puppet/examples/test" - sh "rspec spec/acceptance/*.rb" + sh "BEAKER_set=#{ENV["platform"]} rspec spec/acceptance/*.rb" end diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/fedora20.yml similarity index 100% rename from spec/acceptance/nodesets/default.yml rename to spec/acceptance/nodesets/fedora20.yml diff --git a/spec/acceptance/running_strings_yardoc.rb b/spec/acceptance/running_strings_yardoc.rb index 7612ab4..3505185 100644 --- a/spec/acceptance/running_strings_yardoc.rb +++ b/spec/acceptance/running_strings_yardoc.rb @@ -20,9 +20,7 @@ describe 'Genearting module documation using yardoc action' do end it "should generate documenation for 3x functions" do - on master, 'cat /root/doc/Puppet3xFunctions.html' do - expect(read_file_on(master, '/root/doc/Puppet3xFunctions.html')).to have_tag('.docstring .discussion', :text => /documentation for `function3x`/) - end + expect(read_file_on(master, '/root/doc/Puppet3xFunctions.html')).to have_tag('.docstring .discussion', :text => /documentation for `function3x`/) end it "should generate documenation for 4x functions" do