Commit Graph

13 Commits

Author SHA1 Message Date
Tobias Urdin
047ea125dd 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
2018-11-20 11:37:55 +01:00
Tobias Urdin
8196a5c350 Remove PUPPET_MAJ_VERSION check for unit modules
The install_modules_unit.sh which is called by the
spec helper to install the modules for the unit
tests checks the PUPPET_MAJ_VERSION variable when
selecting the puppet base path.

The zuul jobs is not configured to give this env
variable so unit tests failed when using the puppet
base path for v3 which was /etc/puppet instead of
/etc/puppetlabs/code that is valid for v4 and v5.

We don't test v3 specifically so the check
should not be needed.

Change-Id: I6a9c53d58f05dfbb8646ad36d3bf5f6bad5588e1
2018-02-06 15:55:43 +01:00
Emilien Macchi
3c8f4ccd85 Revert "Remove r10k env vars with proper args"
It broke all unit tests jobs:
http://logs.openstack.org/98/535698/16/gate/puppet-openstack-unit-4.8-centos-7/bd7dedf/job-output.txt.gz#_2018-02-05_23_19_05_369251


This reverts commit 9f14f75ec6.

Change-Id: Ibcb2bb60a668d232371e4d87febad6d67b3302d8
2018-02-06 03:34:38 +00:00
Tobias Urdin
9f14f75ec6 Remove r10k env vars with proper args
The PUPPETFILE and PUPPETFILE_DIR environment
variables are deprecated since several releases
and are superseeded by the --puppetfile and
--moduledir arguments. [0] [1]

This patch replaces all those occurences to future
proof it when the env vars are removed.

[0] http://logs.openstack.org/57/529657/2/check/puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial/ce6f987/job-output.txt.gz#_2017-12-21_22_52_53_499924
[1] https://github.com/puppetlabs/r10k/pull/479

Change-Id: I216fe01a13e46c90bbb1455df72b25daf899c9f0
2017-12-22 15:29:24 +01:00
Emilien Macchi
8627b03699 install_modules_unit: list modules
When deploying Puppet modules in unit jobs, let's also list the modules
so we can know which versions are deployed.

Change-Id: I22ecd983c3164db5c0fa233a02ee5de1eb1e70bb
2017-11-20 09:58:44 -08:00
David Moreau-Simard
22c29c79ac Ensure $GEM_BIN_DIR is in $PATH
This makes gem binary usage consistent (i.e, r10k) and prevents
encoutering a command not found error.

Change-Id: I3ef01274417cd88403d71af0e6216850d77cc81c
Closes-Bug: #1592113
2016-06-13 14:11:46 -04:00
Emilien Macchi
ad5546a400 Rename PUPPET_VERSION to PUPPET_MAJ_VERSION
PUPPET_VERSION is already used by puppetlabs/beaker and we don't want to
overlap with this variable. So let's rename it to PUPPET_MAJ_VERSION to
avoid strange behaviors when running Beaker jobs.

Change-Id: I74be2eec2be53f59af196f37ee348ff6856af8bc
2016-06-08 08:54:02 -04:00
Alex Schultz
20730feff0 Add a function for generating action headers
In order to help be able to determine what part of the script a failure
occurs in, this change adds a print header function and updates the
shell scripts to print some header information for various actions.

Change-Id: I8e622c4d1c9c03aa3dbcb27712a346ce3284003f
2016-04-14 14:57:22 -06:00
Sofer Athlan-Guyot
53eb3a966d Fix bug and non-idiom in bash scripts.
Those small typos and non-idiom can lead to unexpected behavior, better
fix them now.

Change-Id: I218ba0f3bba832d0929fb52c21f7e66774da494e
Closes-Bug: #1561539
2016-03-24 14:39:05 +01:00
Emilien Macchi
cf864be1bc install_modules: export PUPPET_BASE_PATH
We need to export PUPPET_BASE_PATH otherwise beaker & unit CI jobs will
fail to copy modules in the right path:
mv /modules/openstack-integration /modules/openstack_integration

Change-Id: I1c99de3f99367fb7677977fee4c5cf08afda5977
2016-03-22 21:31:34 -04:00
Cody Herriges
8d1005bc16 Round 1 of Puppet 4 support
This commit puts in place the ability to run
  puppet-openstack-integation against Pupept 4 by making release files
  and paths dynamic based off an environment variable, PUPPET_VERSION.

  Configurability is required because of the way Puppet 4 is installed,
  as an all-in-one package known as "PC1" or "puppet-agent" which
  includes Ruby, Facter 3, and other dependencies.

Change-Id: Id3af52f4938378a5a620765321cecd547e079660
2016-03-21 12:41:16 -07:00
Alex Schultz
ba8ee11132 Fix scripts to be OSX compatible
readlink on OSX does not support the -f option. As an alternative, we
can use pwd -P to resolve the path.

Change-Id: Ibaeadea9685f7a9603198ed1a509176cf70f9b21
Closes-Bug: #1506504
2015-10-15 10:01:17 -05:00
Emilien Macchi
151b40ba00 Create install_modules_unit.sh
Create install_modules_unit.sh that will install Puppet modules needed
to run unit tests.

Change-Id: Ia0f19b08d164442ca0fdb9d40fe3820c94e472d7
2015-10-06 15:58:09 +00:00