Drop puppet3 support

Code Issues Proposed changes

Puppet 3 was EOL as of December 31, 2016. Since we don't use it in the
gate for Pike, let's drop the configuration bits in p-o-i for it. This
change leaves the PUPPET_MAJ_VERSION support on the off chance we need
it in the future but basically 4 is currently the only supported
version.
Change-Id: I0f04a3cb194ec2225010fb4e062703195b79baf1

This commit is contained in:

Alex Schultz

2017年05月26日 13:42:25 -06:00

parent aefb4761cd

commit 7f9907baa6

3 changed files with 14 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6
run_tests.sh

View File

@@ -17,7 +17,7 @@ export SCRIPT_DIR=$(cd `dirname 0ドル` && pwd -P)

source ${SCRIPT_DIR}/functions

export WORKSPACE=${WORKSPACE:-/tmp}

export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-3}

export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-4}

export SCENARIO=${SCENARIO:-scenario001}

export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}

export MANAGE_REPOS=${MANAGE_REPOS:-true}

@@ -71,10 +71,6 @@ if [ $PUPPET_MAJ_VERSION == 4 ]; then

export PUPPET_RELEASE_FILE=puppetlabs-release-pc1

export PUPPET_BASE_PATH=/etc/puppetlabs/code

export PUPPET_PKG=puppet-agent

else

export PUPPET_RELEASE_FILE=puppetlabs-release

export PUPPET_BASE_PATH=/etc/puppet

export PUPPET_PKG=puppet

fi

print_header 'Start (run_tests.sh)'

Drop puppet3 support

6 run_tests.sh Unescape Escape View File

6
run_tests.sh

View File