openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Add ability to manually install puppet modules"

Browse Source
This commit is contained in:
Jenkins 2016-02-17 03:45:05 +00:00 committed by Gerrit Code Review
commit 1a3506db20
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
run_tests.sh
View File

@ -14,6 +14,7 @@
# under the License. # under the License.
export SCENARIO=${SCENARIO:-scenario001} export SCENARIO=${SCENARIO:-scenario001}
export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}
export MANAGE_REPOS=${MANAGE_REPOS:-true} export MANAGE_REPOS=${MANAGE_REPOS:-true}
export PUPPET_ARGS=${PUPPET_ARGS:-} export PUPPET_ARGS=${PUPPET_ARGS:-}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
@ -62,7 +63,9 @@ elif is_fedora; then
$SUDO yum install -y dstat puppet $SUDO yum install -y dstat puppet
fi fi
$SUDO ./install_modules.sh if [ "${MANAGE_PUPPET_MODULES}" = true ]; then
$SUDO ./install_modules.sh
fi
# use dstat to monitor system activity during integration testing # use dstat to monitor system activity during integration testing
if type "dstat" 2>/dev/null; then if type "dstat" 2>/dev/null; then