From c16f628d97da553f550840f9da1174bc7756f44a Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 8 May 2020 17:07:07 +0200
Subject: [PATCH] Change minimum Puppet version to 6

Change-Id: Ic84d587a01f7ca58c3a18bce26a1fe7e131a11a0
---
 puppet-openstack_spec_helper.gemspec | 2 +-
 run_syntax_tests.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet-openstack_spec_helper.gemspec b/puppet-openstack_spec_helper.gemspec
index 95be945..2b2ee91 100644
--- a/puppet-openstack_spec_helper.gemspec
+++ b/puppet-openstack_spec_helper.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   minitest_version = RUBY_VERSION < '2.3.0' ? ['< 5.12.1'] : ['>= 5.12.1']
   spec.add_dependency 'minitest', minitest_version
 
-  puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 5.5']
+  puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 6.0']
   spec.add_dependency 'puppet', puppetversion
 
   # TODO(tobias-urdin): We need to bump this to 2.7.1 soon which will cause strict checking
diff --git a/run_syntax_tests.sh b/run_syntax_tests.sh
index 899321d..59aa825 100755
--- a/run_syntax_tests.sh
+++ b/run_syntax_tests.sh
@@ -16,7 +16,7 @@
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source $SCRIPT_DIR/functions
 
-export PUPPET_VERSION=${PUPPET_VERSION:-4}
+export PUPPET_VERSION=${PUPPET_VERSION:-6}
 PUPPET_MAJOR_VERSION=`echo $PUPPET_VERSION | cut -c 1`
 export PUPPET_GEM_VERSION="~> $PUPPET_MAJOR_VERSION"