opendev
/
puppet-openstack_infra_spec_helper
Code Issues Proposed changes

Check if we are running under Zuul v3 

Update the Zuul conditional check to handle Zuul v3. Zuul v3 no longer
sets a URL or BRANCH env variable so we shouldn't rely on those for
checking if we are running under Zuul. Instead we can check if the
ZUUL_UUID is set which will be present for every job.

Depends-On: I83e7088c36b1b57279bb32e44c9f74730da582cf
Change-Id: Id4f6ae8cc4128083f0db72fb6e2dc81b9968e884
This commit is contained in:
Clark Boylan 2017-11-29 15:31:39 -08:00
parent 77dcdb469e
commit 6a6f5c85cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb Normal file → Executable file
View File

@ -23,7 +23,7 @@ def install_system_config(host)
# Install dependent modules via git or zuul
on host, "rm -fr #{SYSTEM_CONFIG}"
if ENV['ZUUL_REF'] && ENV['ZUUL_BRANCH'] && ENV['ZUUL_URL']
if ENV['ZUUL_UUID']
zuul_clone_cmd = '/usr/zuul-env/bin/zuul-cloner '
zuul_clone_cmd += '--cache-dir /opt/git '
zuul_clone_cmd += "git://git.openstack.org #{SYSTEM_CONFIG}"