openstack/puppet-openstack-integration
Code Issues Proposed changes

Do a regular clone of tempest if we're running outside the gate

Browse Source 
Disable git_clone from scenario003, all-in-one.sh leverages
run_tests which will now properly clone tempest if whether or not
we're in the gate.

Change-Id: I687464f26913bc9ee978e00e5c78efe91b062ec2
This commit is contained in:
David Moreau Simard 2015-11-25 12:23:48 -05:00
parent 9cdd38a4e5
commit 6d26ea258f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixtures/scenario003.pp
View File

@ -384,7 +384,7 @@ class { '::tempest':
debug => true, debug => true,
use_stderr => false, use_stderr => false,
log_file => 'tempest.log', log_file => 'tempest.log',
git_clone => true, git_clone => false,
tempest_clone_path => '/tmp/tempest', tempest_clone_path => '/tmp/tempest',
tempest_clone_owner => $::id, tempest_clone_owner => $::id,
lock_path => '/tmp/tempest', lock_path => '/tmp/tempest',

3
run_tests.sh
View File

@ -34,6 +34,9 @@ fi
if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then
/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
git://git.openstack.org openstack/tempest git://git.openstack.org openstack/tempest
else
# We're outside the gate, just do a regular git clone
git clone git://git.openstack.org/openstack/tempest /tmp/openstack/tempest
fi fi
PUPPET_ARGS="--detailed-exitcodes --verbose --color=false --debug" PUPPET_ARGS="--detailed-exitcodes --verbose --color=false --debug"