Merge pull request #34 from melissa/maint/master/skip-master-tests

Maint/master/skip master tests

Author: jhelwig

setup/aio/011_Install_Puppet_Server.rb

@@ -2,6 +2,8 @@
 extend Beaker::DSL::InstallUtils::FOSSUtils
 
 test_name "Install Puppet Server" do
+  skip_test "not testing with puppetserver" unless @options['is_puppetserver']
+
   server_version = ENV['SERVER_VERSION'] || 'latest'
   release_stream = ENV['RELEASE_STREAM'] || 'puppet'
   nightly_builds_url = ENV['NIGHTLY_BUILDS_URL'] || 'http://nightlies.puppet.com'

setup/aio/020_InstallCumulusModules.rb

@@ -1,5 +1,6 @@
 platforms = hosts.map{|val| val[:platform]}
 skip_test "No cumulus hosts present" unless platforms.any? { |val| /cumulus/ =~ val }
+skip_test "not testing with puppetserver" unless @options['is_puppetserver']
 confine :to, {}, hosts.select { |host| host[:roles].include?('master') }
 
 step 'install Cumulus Modules on masters' do

setup/aio/021_InstallAristaModuleMasters.rb

@@ -0,0 +1,12 @@
+platforms = hosts.map{|val| val[:platform]}
+skip_test "No arista hosts present" unless platforms.any? { |val| /^eos-/ =~ val }
+skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
+test_name 'Arista Switch Pre-suite' do
+  masters = select_hosts({:roles => ['master', 'compile_master']})
+
+  step 'install Arista Module on masters' do
+    masters.each do |node|
+      on(node, puppet('module','install','aristanetworks-netdev_stdlib_eos'))
+    end
+  end
+end

setup/aio/021_InstallAristaModule.rb renamed to setup/aio/022_InstallAristaModuleAgents.rb

@@ -1,15 +1,8 @@
 platforms = hosts.map{|val| val[:platform]}
 skip_test "No arista hosts present" unless platforms.any? { |val| /^eos-/ =~ val }
 test_name 'Arista Switch Pre-suite' do
-  masters = select_hosts({:roles => ['master', 'compile_master']})
   switchs = select_hosts({:platform => ['eos-4-i386']})
 
-  step 'install Arista Module on masters' do
-    masters.each do |node|
-      on(node, puppet('module','install','aristanetworks-netdev_stdlib_eos'))
-    end
-  end
-
   step 'add puppet user to switch' do
     switchs.each do |switch|
       on(switch, "useradd -U puppet")

setup/aio/045_EnsureMasterStarted.rb

@@ -1 +1,4 @@
-on(master, puppet('resource', 'service', master['puppetservice'], "ensure=running"))
+test_name "Ensure the master is running"
+skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
+
+on(master, puppet('resource', 'service', master['puppetservice'], "ensure=running", "enable=true"))

setup/common/025_StopFirewall.rb

@@ -1,4 +1,5 @@
 test_name "Stop firewall" do
+  skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
   hosts.each do |host|
     case host['platform']
     when /debian/

setup/common/040_ValidateSignCert.rb

@@ -1,4 +1,5 @@
 test_name "Validate Sign Cert" do
+  skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
   hostname = on(master, 'facter hostname').stdout.strip
   fqdn = on(master, 'facter fqdn').stdout.strip
 

setup/git/010_TestSetup.rb

@@ -77,21 +77,6 @@
     end
   end
 
-  step "Hosts: create basic puppet.conf" do
-    hosts.each do |host|
-      confdir = host.puppet['confdir']
-      on host, "mkdir -p #{confdir}"
-      puppetconf = File.join(confdir, 'puppet.conf')
-
-      if host['roles'].include?('agent')
-        on host, "echo '[agent]' > '#{puppetconf}' && " +
-                 "echo server=#{master} >> '#{puppetconf}'"
-      else
-        on host, "touch '#{puppetconf}'"
-      end
-    end
-  end
-
   step "Hosts: create environments directory like AIO does" do
     hosts.each do |host|
       codedir = host.puppet['codedir']

setup/git/011_SetMaster.rb

@@ -0,0 +1,15 @@
+test_name 'Hosts: create basic puppet.conf' do
+  skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
+  hosts.each do |host|
+    confdir = host.puppet['confdir']
+    on host, "mkdir -p #{confdir}"
+    puppetconf = File.join(confdir, 'puppet.conf')
+
+    if host['roles'].include?('agent')
+      on host, "echo '[agent]' > '#{puppetconf}' && " +
+               "echo server=#{master} >> '#{puppetconf}'"
+    else
+      on host, "touch '#{puppetconf}'"
+    end
+  end
+end

setup/git/030_PuppetMasterSanity.rb

@@ -1,5 +1,7 @@
 test_name "Puppet Master sanity checks: PID file and SSL dir creation"
 
+skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
+
 hostname = on(master, 'facter hostname').stdout.strip
 fqdn = on(master, 'facter fqdn').stdout.strip