From 6a6f5c85cc74c54d08aa2961763493f9542dee7c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 29 Nov 2017 15:31:39 -0800 Subject: [PATCH] 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 --- .../spec_helper_acceptance.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb diff --git a/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb b/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb old mode 100644 new mode 100755 index c7b81fa..f63d71d --- a/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb +++ b/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb @@ -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}"