diff --git a/run_tests.sh b/run_tests.sh index a492d17ea..ced11096d 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -24,6 +24,7 @@ export HIERA_CONFIG=${HIERA_CONFIG:-${SCRIPT_DIR}/hiera/hiera.yaml} export MANAGE_HIERA=${MANAGE_HIERA:-true} export PUPPET_ARGS="${PUPPET_ARGS} --detailed-exitcodes --color=false --test --trace --hiera_config ${HIERA_CONFIG} --logdest ${WORKSPACE}/puppet.log" export DISTRO=$(lsb_release -c -s) +export TEMPEST_VERSION=${TEMPEST_VERSION:-'origin/master'} # NOTE(pabelanger): Setup facter to know about AFS mirror. if [ -f /etc/nodepool/provider ]; then @@ -98,6 +99,10 @@ else fi fi +pushd /tmp/openstack/tempest +git reset --hard $TEMPEST_VERSION +popd + # NOTE(pabelanger): We cache cirros images on our jenkins slaves, check if it # exists. if [ -f ~/cache/files/cirros-0.3.4-x86_64-disk.img ]; then