Merge remote-tracking branch 'upstream/stable'

* upstream/stable: (FACT-1198) Update platform field to use version numbers (FACT-1266) Remove leading dot from .gemspec.in
puppetlabs · Nov 5, 2015 · 7da0699 · 7da0699
2 parents 856822f + 8abd6de
commit 7da0699
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/acceptance/config/nodes/osx-1010-x86_64.yaml b/acceptance/config/nodes/osx-1010-x86_64.yaml
@@ -3,7 +3,7 @@ HOSTS:
   agent:
     roles:
     - agent
-    platform: osx-yosemite-x86_64
+    platform: osx-10.10-x86_64
     hypervisor: vcloud
     template: osx-1010-x86_64
 CONFIG:

diff --git a/acceptance/config/nodes/osx-1011-x86_64.yaml b/acceptance/config/nodes/osx-1011-x86_64.yaml
@@ -3,7 +3,7 @@ HOSTS:
   agent:
     roles:
     - agent
-    platform: osx-elcapitan-x86_64
+    platform: osx-10.11-x86_64
     hypervisor: vcloud
     template: osx-1011-x86_64
 CONFIG:

diff --git a/acceptance/config/nodes/osx-109-x86_64.yaml b/acceptance/config/nodes/osx-109-x86_64.yaml
@@ -3,7 +3,7 @@ HOSTS:
   agent:
     roles:
     - agent
-    platform: osx-mavericks-x86_64
+    platform: osx-10.9-x86_64
     hypervisor: vcloud
     template: osx-109-x86_64
 CONFIG:

diff --git a/acceptance/lib/puppet/acceptance/install_utils.rb b/acceptance/lib/puppet/acceptance/install_utils.rb
@@ -7,7 +7,7 @@ module Puppet
   module Acceptance
     module InstallUtils
       PLATFORM_PATTERNS = {
-        :redhat        => /fedora|el|centos/,
+        :redhat        => /fedora|el-|centos/,
         :debian        => /debian|ubuntu/,
         :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
         :solaris       => /solaris/,

diff --git a/acceptance/tests/facts/macosx.rb b/acceptance/tests/facts/macosx.rb
@@ -7,10 +7,10 @@
 # Facts tested: os, processors, networking, identity, kernel
 #
 
-confine :to, :platform => /osx-mavericks|osx-yosemite/
+confine :to, :platform => /osx-10\.9|osx-10\.10/
 
 agents.each do |agent|
-  if agent['platform'] =~ /osx-mavericks/
+  if agent['platform'] =~ /osx-10\.9/
     os_version = '10.9'
     kernel_major = '13'
   else

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -15,7 +15,7 @@ configure_file (
 
 # Generate a .gemspec file based on the above version numbers
 configure_file (
-    ".gemspec.in"
+    "gemspec.in"
     "${CMAKE_CURRENT_LIST_DIR}/../.gemspec"
 )
 

diff --git a/lib/.gemspec.in → lib/gemspec.in b/lib/.gemspec.in → lib/gemspec.in