74a92c4645
In order to run the script directly in the test, the script needs to have the executable bit set. Currently, the test is failing with a "Permission denied" error when attempting to run the script. We also need to run install_modules.sh in the logstash-filters test, so move that invocation to the shared prep-apply.sh script. The vcsrepo puppet define doesn't understand revisions of the form "refs/zuul/foo", so instead parse the HEAD sha and pass that to vcsrepo. Finally, we need to ensure that $elasticsearch_nodes is populated with an array, otherwise the function @elasticsearch_nodes.map in the output.conf template will fail. Change-Id: Ic1ab6d04232abb3cf347f0d27afbf9172f62b0e4
36 lines
1.3 KiB
Bash
Executable File
36 lines
1.3 KiB
Bash
Executable File
#!/bin/bash -ex
|
|
|
|
# Copyright 2016 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
. ./tools/prep-apply.sh
|
|
|
|
/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
|
|
git://git.openstack.org \
|
|
openstack-infra/logstash-filters
|
|
sha=$(git --git-dir=/tmp/openstack-infra/logstash-filters/.git rev-parse HEAD)
|
|
|
|
cat > node.pp <<EOF
|
|
\$elasticsearch_nodes = [ 'localhost' ]
|
|
class { 'openstack_project::logstash_worker':
|
|
filter_source => 'file:///tmp/openstack-infra/logstash-filters/.git',
|
|
filter_rev => '$sha',
|
|
}
|
|
EOF
|
|
|
|
sudo apt-get update # Update apt cache before running puppet
|
|
sudo puppet apply --modulepath=${MODULE_PATH} --color=false --debug node.pp
|
|
|
|
/opt/logstash/bin/logstash --configtest --config /etc/logstash/conf.d -w 1
|