(MODULES-4097) Sync travis.yml

puppetlabs · Jan 6, 2017 · 8cb20a2 · 8cb20a2
1 parent 6cb234e
commit 8cb20a2
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 27 deletions.
diff --git a/config_defaults.yml b/config_defaults.yml
@@ -1,4 +1,42 @@
 ---
+:global:
+  supported_oss:
+    puppetlabs-acl:                      [windows]
+    puppetlabs-chocolatey:               [windows]
+    puppetlabs-dism:                     [windows]
+    puppetlabs-dsc:                      [windows]
+    puppetlabs-iis:                      [windows]
+    puppetlabs-powershell:               [windows]
+    puppetlabs-reboot:                   [windows]
+    puppetlabs-registry:                 [windows]
+    puppetlabs-sqlserver:                [windows]
+    puppetlabs-wsus_client:              [windows]
+    puppetlabs-inifile:                  [linux,windows]
+    puppetlabs-stdlib:                   [linux,windows]
+    puppetlabs-accounts:                 [linux]
+    puppetlabs-apache:                   [linux]
+    puppetlabs-apt:                      [linux]
+    puppetlabs-concat:                   [linux]
+    puppetlabs-firewall:                 [linux]
+    puppetlabs-haproxy:                  [linux]
+    puppetlabs-hocon:                    [linux]
+    puppetlabs-ibm_installation_manager: [linux]
+    puppetlabs-inifile:                  [linux]
+    puppetlabs-java:                     [linux]
+    puppetlabs-java_ks:                  [linux]
+    puppetlabs-mongodb:                  [linux]
+    puppetlabs-motd:                     [linux]
+    puppetlabs-mysql:                    [linux]
+    puppetlabs-ntp:                      [linux]
+    puppetlabs-postgresql:               [linux]
+    puppetlabs-rabbitmq:                 [linux]
+    puppetlabs-stdlib:                   [linux]
+    puppetlabs-tagmail:                  [linux]
+    puppetlabs-tftp:                     [linux]
+    puppetlabs-tomcat:                   [linux]
+    puppetlabs-vcsrepo:                  [linux]
+    puppetlabs-vsphere:                  [linux]
+    puppetlabs-xinetd:                   [linux]
 .travis.yml:
   script: "\"bundle exec rake release_checks\""
   docker_sets:
@@ -16,29 +54,10 @@
   - rvm: 2.3.1
     env: PUPPET_GEM_VERSION="~> 4.0"
     bundler_args: --without system_tests
-  - rvm: 2.1.9
+  - rvm: 2.1.7
     env: PUPPET_GEM_VERSION="~> 4.0"
     bundler_args: --without system_tests
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-    bundler_args: --without system_tests
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-    bundler_args: --without system_tests
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-    bundler_args: --without system_tests
 Gemfile:
-  supports_windows:
-    - puppetlabs-acl
-    - puppetlabs-chocolatey
-    - puppetlabs-dism
-    - puppetlabs-dsc
-    - puppetlabs-powershell
-    - puppetlabs-reboot
-    - puppetlabs-registry
-    - puppetlabs-sqlserver
-    - puppetlabs-wsus_client
   required:
     ':development':
       - gem: puppet-lint

diff --git a/moduleroot/.travis.yml b/moduleroot/.travis.yml
@@ -10,13 +10,15 @@ before_install:
 matrix:
   fast_finish: true
   include:
-<% if @configs['docker_sets'] -%>
-<%   @configs['docker_sets'].each do |set| -%>
-<%     job = @configs['docker_defaults'].merge(set['options'] || {}) -%>
+<% if @configs['supported_oss'][@configs[:puppet_module]].include?('linux') -%>
+<%   if @configs['docker_sets'] -%>
+<%     @configs['docker_sets'].each do |set| -%>
+<%       job = @configs['docker_defaults'].merge(set['options'] || {}) -%>
   - rvm: <%= job['rvm'] %>
-<%     job.keys.sort.each do |k| -%>
-<%     next if k == 'rvm' -%>
+<%       job.keys.sort.each do |k| -%>
+<%       next if k == 'rvm' -%>
     <%= k %>: <%= job[k].gsub(/@@SET@@/, set['set']) %>
+<%       end -%>
 <%     end -%>
 <%   end -%>
 <% end -%>

diff --git a/moduleroot/Gemfile b/moduleroot/Gemfile
@@ -28,8 +28,16 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 <%
-# Workaround to support boolean and array supports_windows settings until one form is no longer used
-supports_windows = (@configs['supports_windows'] == true || (@configs['supports_windows'].is_a?(Array) && @configs['supports_windows'].include?(@configs[:puppet_module])))
+# Workaround to support boolean supports_windows and hash+array supported_oss
+# settings until one form is no longer used
+supports_windows = (
+  @configs['supports_windows'] == true \
+  || (
+    @configs['supported_oss'].is_a?(Hash) \
+    && @configs['supported_oss'][@configs[:puppet_module]].is_a?(Array) \
+    && @configs['supported_oss'][@configs[:puppet_module]].include?('windows')
+  )
+)
 -%>
 # Used for gem conditionals
 supports_windows = <%= supports_windows %>