From 6d26ea258fdfa5677c99f107eace9936a8e168c0 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Wed, 25 Nov 2015 12:23:48 -0500 Subject: [PATCH] Do a regular clone of tempest if we're running outside the gate 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 --- fixtures/scenario003.pp | 2 +- run_tests.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index acca1b6d2..99eba7cc5 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -384,7 +384,7 @@ class { '::tempest': debug => true, use_stderr => false, log_file => 'tempest.log', - git_clone => true, + git_clone => false, tempest_clone_path => '/tmp/tempest', tempest_clone_owner => $::id, lock_path => '/tmp/tempest', diff --git a/run_tests.sh b/run_tests.sh index 48eaaf748..d726a78f1 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -34,6 +34,9 @@ fi if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ 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 PUPPET_ARGS="--detailed-exitcodes --verbose --color=false --debug"