diff --git a/.travis.yml b/.travis.yml index 090a912a8..b57737a5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,9 +45,9 @@ matrix: rvm: 2.1.9 branches: only: - - master - - /^v\d/ - - release + - master + - /^v\d/ + - release notifications: email: false deploy: diff --git a/Gemfile b/Gemfile index 3cb954d40..90e39f2b4 100644 --- a/Gemfile +++ b/Gemfile @@ -36,9 +36,9 @@ group :development do gem "puppet-lint-i18n", require: false end group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "beaker-testmode_switcher", require: false + gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "beaker-testmode_switcher", require: false end puppet_version = ENV['PUPPET_GEM_VERSION'] diff --git a/metadata.json b/metadata.json index bcd403b20..a5f5fff69 100644 --- a/metadata.json +++ b/metadata.json @@ -84,6 +84,6 @@ ], "description": "MySQL module", "template-url": "https://github.com/puppetlabs/pdk-templates", - "template-ref": "heads/master-0-g6b0d497", - "pdk-version": "1.5.0" + "template-ref": "1.7.0-0-g57412ed", + "pdk-version": "1.7.0" } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1f25b2d1b..84de0e8d6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,3 @@ - require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet-facts'