openstack/puppet-openstack-integration
Code Issues Proposed changes

Add support to test Puppet 5

Browse Source 
Allow to deploy Puppet 5 (experimental) when setting
PUPPET_MAJ_VERSION=5 (currently done by experimental jobs).

It will pull packages from nightly builds, so we can use it and see if
things are working.

Change-Id: I3d0f2f4309c425435370d7f7d4d367c62396c8fc
This commit is contained in:
Emilien Macchi 2017-05-31 15:33:05 +02:00
parent 2db2279b22
commit 01c4f962ae
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions
View File

@ -170,7 +170,7 @@ install_puppet() {
$SUDO rm -f /tmp/puppet.rpm $SUDO rm -f /tmp/puppet.rpm
if [ "${MANAGE_REPOS}" == "true" ] ; then if [ "${MANAGE_REPOS}" == "true" ] ; then
wget http://yum.puppetlabs.com/${PUPPET_RELEASE_FILE}-el-7.noarch.rpm -O /tmp/puppet.rpm wget http://yum.puppetlabs.com/${PUPPET_URL_SUFFIX}${PUPPET_RELEASE_FILE}-el-7.noarch.rpm -O /tmp/puppet.rpm
$SUDO rpm -ivh /tmp/puppet.rpm $SUDO rpm -ivh /tmp/puppet.rpm
fi fi
$SUDO yum install -y ${PUPPET_PKG} $SUDO yum install -y ${PUPPET_PKG}

9
run_tests.sh
View File

@ -17,6 +17,7 @@ export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source ${SCRIPT_DIR}/functions source ${SCRIPT_DIR}/functions
export WORKSPACE=${WORKSPACE:-/tmp} export WORKSPACE=${WORKSPACE:-/tmp}
export PUPPET_URL_SUFFIX=
export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-4} export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-4}
export SCENARIO=${SCENARIO:-scenario001} export SCENARIO=${SCENARIO:-scenario001}
export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true} export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}
@ -71,6 +72,14 @@ if [ $PUPPET_MAJ_VERSION == 4 ]; then
export PUPPET_RELEASE_FILE=puppetlabs-release-pc1 export PUPPET_RELEASE_FILE=puppetlabs-release-pc1
export PUPPET_BASE_PATH=/etc/puppetlabs/code export PUPPET_BASE_PATH=/etc/puppetlabs/code
export PUPPET_PKG=${PUPPET_PKG:-puppet-agent} export PUPPET_PKG=${PUPPET_PKG:-puppet-agent}
elif [ $PUPPET_MAJ_VERSION == 5 ]; then
export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin
export PUPPET_RELEASE_FILE=puppet5-nightly-release
export PUPPET_BASE_PATH=/etc/puppetlabs/code
export PUPPET_PKG=${PUPPET_PKG:-puppet-agent}
if is_fedora; then
PUPPET_URL_SUFFIX='puppet5-nightly/'
fi
fi fi
print_header 'Start (run_tests.sh)' print_header 'Start (run_tests.sh)'