From ac91c1127fda792a8ce6f888d4c4a7fb0bd4ef32 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 22 May 2023 13:23:32 +0900
Subject: [PATCH] Bump default puppet version from 6 to 7

... because puppet 6 already reached its EOL.

Change-Id: Ide378181561297b1263792cc1bbe5085e2910f9b
---
 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 23f863a..d38a500 100644
--- a/puppet-openstack_spec_helper.gemspec
+++ b/puppet-openstack_spec_helper.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake'
   spec.add_dependency 'minitest'
 
-  puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 6.0']
+  puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 7.0']
   spec.add_dependency 'puppet', puppetversion
 
   rspec_puppet_version = ENV.key?('RSPEC_PUPPET_VERSION') ? ENV['RSPEC_PUPPET_VERSION'] : ['~> 2.10.0']
diff --git a/run_syntax_tests.sh b/run_syntax_tests.sh
index 59aa825..72a6e27 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:-6}
+export PUPPET_VERSION=${PUPPET_VERSION:-7}
 PUPPET_MAJOR_VERSION=`echo $PUPPET_VERSION | cut -c 1`
 export PUPPET_GEM_VERSION="~> $PUPPET_MAJOR_VERSION"