Merge pull request GannettDigital#10 from GannettDigital/GDAES-2114-jenkins-centos7

kbvincent · kbvincent · commit 2691e2078a8f · 2015-10-07T10:49:03.000-04:00
GDAES-2114 - initial support for centos 7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@ python Cookbook CHANGELOG
 =========================
 This file is used to list changes made in each version of the python cookbook.
 
+v1.5.4
+-----
+- Jason Neves - Initial support for centos 7
+
 v1.5.3
 ------
 - Franklin Hanson: Fix default python release version for amazon platform
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -47,11 +47,24 @@
   case platform
   when 'amazon'
     default['python']['version'] = '2.7.9-1.amzn1.gd'
-  else
-    default['python']['version'] = '2.7.9-1.el6.gd'
+  when 'centos', 'redhat'
+    if node['platform_version'].to_f >= 7
+      default['python']['version'] = '2.7.5-18.el7_1.1'
+    else
+      default['python']['version'] = '2.7.9-1.el6.gd'
+    end
   end
 when 'package'
-  default['python']['version'] = '2.6.6-64.el6'
+  case platform
+  when 'centos', 'redhat'
+    if node['platform_version'].to_f >= 7
+      default['python']['version'] = '2.7.5-18.el7_1.1'
+    else
+      default['python']['version'] = '2.6.6-64.el6'
+    end
+  else
+    default['python']['version'] = '2.6.6-64.el6'
+  end
 when 'source'
   default['python']['version'] = '2.7.9'
 end
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license           'Apache 2.0'
 description       'Installs Python, pip and virtualenv. \
                    Includes LWRPs for managing Python packages with `pip` and `virtualenv` isolated Python environments.'
-version           '1.5.3'
+version           '1.5.4'
 
 depends           'build-essential'
 depends           'yum-epel'
diff --git a/test/integration/default/serverspec/pip_spec.rb b/test/integration/default/serverspec/pip_spec.rb
@@ -12,5 +12,5 @@
 
 describe command('/usr/local/bin/pip show pip') do
   its(:stdout) { should contain('Name: pip') }
-  its(:stdout) { should contain('Version: 7.1.0') }
+  its(:stdout) { should contain('Version: 7.1.2') }
 end
diff --git a/test/integration/package/serverspec/pip_spec.rb b/test/integration/package/serverspec/pip_spec.rb
@@ -20,5 +20,5 @@
 
 describe command("#{pip_binary} show pip") do
   its(:stdout) { should contain('Name: pip') }
-  its(:stdout) { should contain('Version: 7.1.0') }
+  its(:stdout) { should contain('Version: 7.1.2') }
 end
diff --git a/test/integration/source/serverspec/pip_spec.rb b/test/integration/source/serverspec/pip_spec.rb
@@ -12,5 +12,5 @@
 
 describe command('/usr/local/bin/pip show pip') do
   its(:stdout) { should contain('Name: pip') }
-  its(:stdout) { should contain('Version: 7.1.0') }
+  its(:stdout) { should contain('Version: 7.1.2') }
 end
