13 Commits

Author SHA1 Message Date
Clark Boylan
797feda87a Allow blank lines in node{} with apply test
The apply test does some really simple string manipulation to generate
puppet manifests based on our site.pp on the fly. Unfortunately the old
code assumed there would be no blank lines within a node{} definition.
This assumption is breaking as we work to decouple the
openstack_project::server contents from within openstack_project
manifests and move that into site.pp.

This is a relatively simple fix where we csplit nodes based on the
previous /^}$/ which ends the last node{} definition instead of
splitting on blank lines. Added some comments to make what the parsing
does a bit more clear.

Change-Id: I2cc7317ed90423d6f923c4303a76e091a0bc2ebb
2015-04-23 11:34:10 -07:00
Jenkins
ca37048c3f Merge "Revert "Puppet apply test creates puppet directory env"" 2015-02-11 00:45:08 +00:00
Jenkins
cef96469f1 Merge "Making the apply test easier to read" 2015-01-25 14:13:06 +00:00
Jeremy Stanley
35f642b68a Revert "Puppet apply test creates puppet directory env"
This reverts commit 3b563fb59e7dfb233d4d0a07117499ac04f4a6ce.

Do not approve until Ief6c8e9bf7d71ddc63dba484390124546f14b93a is
applied to new nodepool images.

Change-Id: Ia7422d4f8fe316cc37c1310def0e7a9e2f232d35
2014-12-12 19:09:31 +00:00
Jeremy Stanley
3b563fb59e Puppet apply test creates puppet directory env
Make /etc/puppet/environments/production/environment.conf so that
the apply test will find a default directory environment.

Change-Id: I062949d6c23545c40690edc39302095b0dec3c84
2014-12-12 16:08:02 +00:00
Spencer Krum
ed46e9303f Source modules.env from apply-test.sh
This causes apply-test.sh to get the list of puppet modules to do
integration test with from modules.env. Modules.env has been
refactored to have three lists of modules: Package modules(MODULES),
SOURCE_MODULES, and INTEGRATION_MODULES.

When PUPPET_INTEGRATION_TEST is not set, INTEGRATION_MODULES is
folded into SOURCE_MODULES.

In apply-test.sh, INTEGRATION_MODULES is sourced from modules.env
and some string/array manipulation is performed to pass each entry
to zuul-cloner.

Change-Id: I47302c5c7e8c41b985f16a05c4e9b8078ea867a3
2014-11-18 21:23:43 +00:00
Spencer Krum
ca76e0c8dd Making the apply test easier to read
--color=false remove ansi escapes
cping /etc/hiera.yaml /etc/puppet/hiera.yaml shuts up puppet
complaining that it doesn't have  hiera.yaml to read

Change-Id: Iea7222c66f2fcc1338bc7baffb572d1a1ab2ecd6
2014-11-17 07:49:52 +00:00
Ramy Asselin
1bf253f91b Split out jenkins module
Part of an effort to split most of puppet modules out of system-config:
http://specs.openstack.org/openstack-infra/infra-specs/specs/puppet-modules.html

Depends-On: https://review.openstack.org/#/c/131302/

Change-Id: I1f6588c46a53d83249de68be6c2b36ddb3c805cb
2014-11-13 13:26:44 -08:00
Mikhail S Medvedev
f27dc5fcd1 Split out kibana module
Part of an effort to split most of puppet modules out of system-config.

https://review.openstack.org/#/c/130619/ should land before this
commit can be merged.

Change-Id: I7720ad7d2b25816c63e971112a7a733bde52b7f3
2014-10-27 14:39:32 -05:00
K Jonathan Harker
948aff1f02 Clean up bashate failures
Fix all of the bashate failures.  Also, bashate will install its negative
tests in its virtualenv, so we need to generate a list of files to pass to
bashate that excludes .tox/

Change-Id: I55559bf6137f705aec9a7f277928ad8d4cadc2ca
2014-09-30 12:40:59 -07:00
Monty Taylor
8387e739fe Add project-config to zuul cloner
Make sure that the puppet apply test gets the project-config repo.

Change-Id: I3a772e84a1bc6028caeabcc8e09a0942f44b8612
2014-09-25 15:58:51 -07:00
James E. Blair
542e170b81 Keep environment for cloner in apply test sudo
The zuul cloner needs the ZUUL_* env vars when setting up projects
for the new apply integration test.

Also, add some more debugging to both versions of the test.

Change-Id: I486b19cecd034250068e4a59604e1e0ca90ed83d
2014-09-15 13:19:37 -07:00
James E. Blair
9d23185ac5 Add integration apply test
Make module installation conditional in install_modules.sh so that
we can specify that we _do not_ want it to install the modules
that will be participating in the integration test.

Add a variant of the apply test script (currently test.sh) that
uses zuul-cloner to check out the appropriate versions of modules
that are participating in the integration test.

Add jobs that run this to the experimental pipeline.

Change-Id: I16055cdd45f6e05aa8ebceb500c5709f265268df
2014-09-03 15:03:09 -07:00