From 6fff191d302c247265a794dbe48fbb0018e6c0b7 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Wed, 22 Aug 2018 14:33:59 +0100
Subject: [PATCH 1/2] pdksync_1.7.0-0-g57412ed

---
 .travis.yml         | 8 ++++----
 Gemfile             | 6 +++---
 metadata.json       | 4 ++--
 spec/spec_helper.rb | 1 -
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 090a912a8..4208b9e74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply BEAKER_PUPPET_AGENT_VERSION=5.5.2
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
       rvm: 2.4.4
       script: bundle exec rake beaker
       services: docker
@@ -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'
 

From 0fcd76f8651793a9b3f6059808914522d21ad744 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Wed, 22 Aug 2018 17:00:00 +0100
Subject: [PATCH 2/2] update to run puppet_agent 5.5.2

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4208b9e74..b57737a5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply BEAKER_PUPPET_AGENT_VERSION=5.5.2
       rvm: 2.4.4
       script: bundle exec rake beaker
       services: docker