Merge pull request #355 from sebastian-miclea/master

(PE-25223) Add OSX 10.14 to the puppet_agent_module
puppetlabs · Feb 27, 2019 · c974707 · c974707
2 parents 00b3b78 + bf5a2bf
commit c974707
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/spec/classes/puppet_agent_osfamily_darwin_spec.rb b/spec/classes/puppet_agent_osfamily_darwin_spec.rb
@@ -30,7 +30,7 @@
 
   describe 'supported environment' do
     context "when running a supported OSX" do
-      ["osx-10.12-x86_64", "osx-10.13-x86_64"].each do |tag|
+      ["osx-10.12-x86_64", "osx-10.13-x86_64", "osx-10.14-x86_64"].each do |tag|
         context "on #{tag} with no aio_version" do
           let(:osmajor) { tag.split('-')[1] }
 

diff --git a/task_spec/spec/acceptance/nodesets/osx1014-64.yml b/task_spec/spec/acceptance/nodesets/osx1014-64.yml
@@ -0,0 +1,13 @@
+---
+HOSTS:
+  osx1014-64-1:
+    hypervisor: vmpooler
+    platform: osx-10.14-x86_64
+    packaging_platform: osx-10.14-x86_64
+    template: osx-1014-x86_64
+    roles:
+    - target
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh
@@ -112,6 +112,7 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
       "10.11") platform_version="10.11";;
       "10.12") platform_version="10.12";;
       "10.13") platform_version="10.13";;
+      "10.14") platform_version="10.14";;
       *) echo "No builds for platform: $major_version"
          exit 1
          ;;