[Puppet-dev] (puppetlabs/puppet-acceptance) (maint) bump dashboard, facter and add console_auth to version checks

[wearetherobots]

Please review pull request #183: (maint) bump dashboard, facter and add console_auth to version checks opened by (justinstoller)

Description:

This bumps the version of dashboard, facter and adds tests for console_auth version to the harness

• Opened: Mon Mar 26 22:06:09 UTC 2012
• Based on: puppetlabs:master (297d246f85c65acedd68f69aa3ada775ff33366d)
• Requested merge: justinstoller:maint/master/bump_facter_dash_and_auth (e586fce14015a0130ac29eb338c29d047ac48747)

Diff follows:

diff --git a/ci/pe/pe_version b/ci/pe/pe_version
index 445737e..adabb0d 100644
--- a/ci/pe/pe_version
+++ b/ci/pe/pe_version
@@ -1,10 +1,11 @@
 VERSION:
   rack_ver: 1.1.3
   gem_ver: 1.3.7
-  facter_ver: 1.6.6
+  facter_ver: 1.6.7
   puppet_ver: 2.7.12
   puppet_module_ver: 0.3.4
   activerecord_ver: 2.3.14
   activesupport_ver: 2.3.14
   ruby_augeas_ver: 4.1
-  dashboard_ver: 1.2.6
+  dashboard_ver: 1.2.7
+  console_auth_ver: 1.0.5
diff --git a/setup/pe/04_PE-version_checks.rb b/setup/pe/04_PE-version_checks.rb
index ff22d33..2ce0e69 100755
--- a/setup/pe/04_PE-version_checks.rb
+++ b/setup/pe/04_PE-version_checks.rb
@@ -82,19 +82,24 @@
 end
 
 
-hosts.each do |host|
-  next unless host['roles'].include?('dashboard')
-  cmd = ''
+[
+  ['pe-puppet-dashboard', 'dashboard_ver'],
+  ['pe-console-auth', 'console_auth_ver']
+].each do |pkg|
+  hosts.each do |host|
+    next unless host['roles'].include?('dashboard')
+    cmd = ''
 
-  if host['platform'] =~ /debian|ubuntu/
-    cmd = "dpkg -l"
-  else
-    cmd = "rpm -q"
-  end
+    if host['platform'] =~ /debian|ubuntu/
+      cmd = "dpkg -l"
+    else
+      cmd = "rpm -q"
+    end
 
-  on host, "#{cmd} pe-puppet-dashboard" do
-    assert_match(/#{version['VERSION']['dashboard_ver']}/, stdout,
-                 "Incorrect version of dashboard on #{host}")
+    on host, "#{cmd} #{pkg[0]}" do
+      assert_match(/#{version['VERSION'][pkg[1]]}/, stdout,
+                   "Incorrect version of #{pkg[0]} on #{host}")
+    end
   end
 end
 

    

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.