Merge 988d940 into b7c33ee

puppetlabs · Feb 3, 2016 · 29676b5 · 29676b5
2 parents b7c33ee + 988d940
commit 29676b5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/acceptance/setup/aio/pre-suite/010_Install.rb b/acceptance/setup/aio/pre-suite/010_Install.rb
@@ -16,6 +16,9 @@
 # make sure install is sane, beaker has already added puppet and ruby
 # to PATH in ~/.ssh/environment
 agents.each do |agent|
+  if agent['platform'] =~ /cisco-5/
+    on agent, "sudo chmod +x /etc/profile.d/puppet-agent.sh"
+  end
   on agent, puppet('--version')
   ruby = Puppet::Acceptance::CommandUtils.ruby_command(agent)
   on agent, "#{ruby} --version"

diff --git a/acceptance/tests/options/custom_facts.rb b/acceptance/tests/options/custom_facts.rb
@@ -1,4 +1,5 @@
 test_name "custom fact commandline options (--no-custom-facts and --custom-dir)"
+confine :except, :platform => 'cisco-5'
 
 require 'puppet/acceptance/common_utils'
 extend Puppet::Acceptance::CommandUtils

diff --git a/acceptance/tests/ticket_1123_facter_with_invalid_locale.rb b/acceptance/tests/ticket_1123_facter_with_invalid_locale.rb
@@ -1,5 +1,7 @@
 test_name 'ticket 1123  facter should not crash with invalid locale setting'
 confine :except, :platform => 'windows'
+confine :except, :platform => 'cisco-5'
+
 agents.each do |host|
   step 'set an invalid value for locale and run facter'
   result = on host, 'LANG=ABCD facter facterversion'

diff --git a/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb b/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb
@@ -1,4 +1,5 @@
 test_name "#7039: Facter having issue handling multiple facts in a single file"
+confine :except, :platform => 'cisco-5'
 
 fact_file= %q{
 Facter.add(:test_fact1) do