fetch current puppet version from puppet command

deric · May 13, 2015 · 85e66aa · 85e66aa
1 parent 02f0416
commit 85e66aa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/spec/classes/debian_spec.rb b/spec/classes/debian_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe 'zookeeper::os::debian', :type => :class do
-  shared_examples 'debian-install' do |os, codename|
+  shared_examples 'debian-install' do |os, codename, puppet|
     let(:facts) {{
       :operatingsystem => os,
       :osfamily => 'Debian',
       :lsbdistcodename => codename,
-      :puppetversion => ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '3.7.1',
+      :puppetversion => puppet,
     }}
 
     it { should contain_package('zookeeper') }
@@ -88,13 +88,16 @@
     let(:user) { 'zookeeper' }
     let(:group) { 'zookeeper' }
 
-    let(:params) { {
+    let(:params) {{
       :snap_retain_count => 1,
-    } }
+    }}
+    # ENV variable might contain characters which are not supported
+    # by versioncmp function (like '~>')
+    puppet = `puppet --version`
 
-    it_behaves_like 'debian-install', 'Debian', 'squeeze'
-    it_behaves_like 'debian-install', 'Debian', 'wheezy'
-    it_behaves_like 'debian-install', 'Ubuntu', 'precise'
+    it_behaves_like 'debian-install', 'Debian', 'squeeze', puppet
+    it_behaves_like 'debian-install', 'Debian', 'wheezy', puppet
+    it_behaves_like 'debian-install', 'Ubuntu', 'precise', puppet
   end
 
   context 'does not install cron script on trusty' do
@@ -122,7 +125,7 @@
       :operatingsystem => 'Ubuntu',
       :osfamily => 'Debian',
       :lsbdistcodename => 'trusty',
-      :puppetversion => ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '3.7.1',
+      :puppetversion => `puppet --version`,
     }}
 
     let(:params) { {

diff --git a/spec/classes/redhat_spec.rb b/spec/classes/redhat_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe 'zookeeper::os::redhat', :type => :class do
-  shared_examples 'redhat-install' do |os, codename|
+  shared_examples 'redhat-install' do |os, codename, puppet|
     let(:facts) {{
       :operatingsystem => os,
       :osfamily => 'RedHat',
       :lsbdistcodename => codename,
-      :puppetversion => ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '3.7.1',
+      :puppetversion => puppet,
     }}
 
     it { should contain_package('zookeeper') }
@@ -90,13 +90,16 @@
   context 'on RedHat-like system' do
     let(:user) { 'zookeeper' }
     let(:group) { 'zookeeper' }
+    # ENV variable might contain characters which are not supported
+    # by versioncmp function (like '~>')
+    puppet = `puppet --version`
 
     let(:params) { {
       :snap_retain_count => 1,
     } }
 
-    it_behaves_like 'redhat-install', 'RedHat', '6'
-    it_behaves_like 'redhat-install', 'CentOS', '5'
-    it_behaves_like 'redhat-install', 'Fedora', '20'
+    it_behaves_like 'redhat-install', 'RedHat', '6', puppet
+    it_behaves_like 'redhat-install', 'CentOS', '5', puppet
+    it_behaves_like 'redhat-install', 'Fedora', '20', puppet
   end
 end
diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'zookeeper::repo', :type => :class do
-  shared_examples 'redhat-install' do |os, codename|
+  shared_examples 'redhat-install' do |os, codename, puppet|
     let(:cdhver){ 4 }
     let(:hardwaremodel){ 'x86_64' }
 
@@ -11,7 +11,7 @@
       :lsbdistcodename => codename,
       :operatingsystemmajrelease => codename,
       :hardwaremodel => hardwaremodel,
-      :puppetversion => ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '3.7.1',
+      :puppetversion => puppet,
     }}
 
     it {
@@ -25,11 +25,14 @@
     let(:user) { 'zookeeper' }
     let(:group) { 'zookeeper' }
 
-    let(:params) { {
+    let(:params) {{
       :source => 'cloudera',
-    } }
+    }}
+    # ENV variable might contain characters which are not supported
+    # by versioncmp function (like '~>')
+    puppet = `puppet --version`
 
-    it_behaves_like 'redhat-install', 'RedHat', '6'
+    it_behaves_like 'redhat-install', 'RedHat', '6', puppet
   end
 
   context 'fail when architecture not supported' do