beaker-puppet 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf6c7573f1464e753122579affd37a18e9184c7
-  data.tar.gz: 1552fbe2833aab8842839f3f715073dd91baffa9
+  metadata.gz: 0e4984104b47dcc714f53c2207bc453aeabf46aa
+  data.tar.gz: b09f92e371c98e7aaaf4667d9bfe23de2dee3abb
 SHA512:
-  metadata.gz: b3c687b34317b0d7601e09aa7da6779b04685fb355cb662d1e5aa36cd06a9883f78d947b2f37ef7016494303b34f9b6dbfb793733f09b79d557a6d68872867aa
-  data.tar.gz: 9fcb8b9f18b67918e802599d68e3b3d0c0463a9766f9151334570f8fe53a216246883ac832295e728cb4c3e23da2267ff3450e1ce52c4bc9819c03a7bdcf7597
+  metadata.gz: b96fd2fa745a86e4ff0523639a390c8eeb73c2a6ea9cd834110ac699899f86a9818b9b6f35e57db853e3f96da8f342477ad01309457fcd2ce1d8b6141516cd6a
+  data.tar.gz: 392f44a882bd9f9f14c532ae7297bfdea012832dce57f9522087550ed400207360c35101bdd62996d3a9687edd1c9614eb5fb5c01d50da298ca6476a7de1a0e7

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/setup/aio/011_Install_Puppet_Server.rb

@@ -2,6 +2,8 @@ extend BeakerPuppet::Install::Puppet5
 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'

data/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

data/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

data/setup/aio/{021_InstallAristaModule.rb → 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")

data/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"))

data/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/

data/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
 

data/setup/git/010_TestSetup.rb

@@ -77,21 +77,6 @@ END
     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']

data/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

data/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
 

data/setup/git/060_InstallModules.rb

@@ -62,6 +62,10 @@ def install_scp_module(mod, hosts)
   scp_to hosts, mod[:url].split(':', 2)[1], target
 end
 
+test_name 'Install Puppet Modules'
+
+skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
+
 modules = PuppetModules.new(options[:modules]).list
 
 step "Masters: Install Puppet Modules"

data/tasks/ci.rake

@@ -11,6 +11,11 @@ REPO_CONFIGS_DIR = 'repo-configs'
 CLEAN.include('*.tar', REPO_CONFIGS_DIR, 'tmp', '.beaker')
 
 # Default test target if none specified
+# TODO There are some projects that do not need to test against a master. It
+# might be worth it to distinguish between these two scenarios so that we are
+# maximizing our available resources. As it, we are allocating a master for all
+# runs. Luckily, that master is also classified as an agent, so it's not a total
+# waste of resources.
 DEFAULT_MASTER_TEST_TARGET = 'redhat7-64m'
 DEFAULT_TEST_TARGETS = "#{DEFAULT_MASTER_TEST_TARGET}a-windows2012r2-64a"
 
@@ -191,7 +196,9 @@ def beaker_suite(type)
   beaker(:init, '--hosts', ENV['HOSTS'], '--options-file', "config/#{String(type)}/options.rb")
   beaker(:provision)
   beaker(:exec, 'pre-suite', '--pre-suite', pre_suites(type))
+  beaker(:exec, 'pre-suite')
   beaker(:exec, ENV['TESTS'])
+  beaker(:exec, 'post-suite')
   beaker(:destroy)
 end
 
@@ -206,7 +213,8 @@ def pre_suites(type)
       "#{beaker_root}/setup/aio/011_Install_Puppet_Server.rb",
       "#{beaker_root}/setup/aio/012_Finalize_Installs.rb",
       "#{beaker_root}/setup/aio/020_InstallCumulusModules.rb",
-      "#{beaker_root}/setup/aio/021_InstallAristaModule.rb",
+      "#{beaker_root}/setup/aio/021_InstallAristaModuleMasters.rb",
+      "#{beaker_root}/setup/aio/022_InstallAristaModuleAgents.rb",
       "#{beaker_root}/setup/common/025_StopFirewall.rb",
       "#{beaker_root}/setup/common/030_StopSssd.rb",
       "#{beaker_root}/setup/common/040_ValidateSignCert.rb",
@@ -222,6 +230,7 @@ def pre_suites(type)
       "#{beaker_root}/setup/common/000-delete-puppet-when-none.rb",
       "#{beaker_root}/setup/git/000_EnvSetup.rb",
       "#{beaker_root}/setup/git/010_TestSetup.rb",
+      "#{beaker_root}/setup/git/011_SetMaster.rb",
       "#{beaker_root}/setup/git/020_PuppetUserAndGroup.rb",
       "#{beaker_root}/setup/common/025_StopFirewall.rb",
       "#{beaker_root}/setup/git/030_PuppetMasterSanity.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -237,7 +237,8 @@ files:
 - setup/aio/011_Install_Puppet_Server.rb
 - setup/aio/012_Finalize_Installs.rb
 - setup/aio/020_InstallCumulusModules.rb
-- setup/aio/021_InstallAristaModule.rb
+- setup/aio/021_InstallAristaModuleMasters.rb
+- setup/aio/022_InstallAristaModuleAgents.rb
 - setup/aio/045_EnsureMasterStarted.rb
 - setup/common/000-delete-puppet-when-none.rb
 - setup/common/025_StopFirewall.rb
@@ -246,6 +247,7 @@ files:
 - setup/gem/010_GemInstall.rb
 - setup/git/000_EnvSetup.rb
 - setup/git/010_TestSetup.rb
+- setup/git/011_SetMaster.rb
 - setup/git/020_PuppetUserAndGroup.rb
 - setup/git/030_PuppetMasterSanity.rb
 - setup/git/060_InstallModules.rb