Add puppet core providers for puppet6

In puppet 6 they have moved out a lot of builtin
resources to their owns modules since they didn't
belong in the Puppet core however in deb/rpm packaging
they are still bundled in but not when installing from
gem.

So we must add them in here so that they are available
in our unit tests.

Change-Id: I7060191395eff9c1e3146cb10594a38bef113117
This commit is contained in:
Tobias Urdin 2018-11-20 01:23:37 +01:00
parent cf52b7d552
commit 047ea125dd
3 changed files with 38 additions and 1 deletions

15
Puppetfile_unit Normal file
View File

@ -0,0 +1,15 @@
mod 'augeas_core',
:git => 'https://github.com/puppetlabs/puppetlabs-augeas_core',
:ref => '1.0.3'
mod 'cron_core',
:git => 'https://github.com/puppetlabs/puppetlabs-cron_core',
:ref => '1.0.0'
mod 'sshkeys_core',
:git => 'https://github.com/puppetlabs/puppetlabs-sshkeys_core',
:ref => '1.0.1'
mod 'yumrepo_core',
:git => 'https://github.com/puppetlabs/puppetlabs-yumrepo_core',
:ref => 'd751a380d7aea5ba88b3571a342039dfae3621e4'

View File

@ -82,6 +82,28 @@ install_modules() {
fi fi
} }
# This is only executed from install_modules_unit.sh because we have
# some modules that is only required for puppet6 unit testing.
# Uses the following variables:
#
# - ``PUPPETFILE_DIR`` must be set to Puppet modules directory
# - ``SCRIPT_DIR`` must be set to script path
# - ``ZUUL_BRANCH`` must be set to Zuul branch
install_modules_unit() {
# If zuul-cloner is there, have it install modules using zuul refs
if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then
csplit ${SCRIPT_DIR}/Puppetfile /'External modules'/ \
--prefix ${SCRIPT_DIR}/Puppetfile \
--suffix '%d'
cat ${SCRIPT_DIR}/Puppetfile_unit >> ${SCRIPT_DIR}/Puppetfile1
install_external
install_openstack
else
cat ${SCRIPT_DIR}/Puppetfile_unit >> ${SCRIPT_DIR}/Puppetfile
install_all
fi
}
# Write out basic hiera configuration # Write out basic hiera configuration
# #
# Uses the following variables: # Uses the following variables:

View File

@ -19,7 +19,7 @@ source $SCRIPT_DIR/functions
print_header 'Start (install_modules_unit.sh)' print_header 'Start (install_modules_unit.sh)'
print_header 'Install Modules' print_header 'Install Modules'
install_modules install_modules_unit
print_header 'Module List' print_header 'Module List'
puppet module list --modulepath ./spec/fixtures/modules puppet module list --modulepath ./spec/fixtures/modules