From 9978a409fec2aef90fe5f3a10f55ae74506021cd Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 20 Nov 2017 09:23:50 -0800 Subject: [PATCH] Check for presence of Zuul with Zuul v3 Zuul v3 compat layer isn't going to set a ZUUL_REF var because we aren't fetching refs from a git repo server. Instead just check if the ZUUL_UUID is set which is a unique id for every job run by Zuul to see if we are running under Zuul. Change-Id: If6c122852d796427b69fc01f41c5587155c039e9 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9854cc9..c3b9d1b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -if ENV['ZUUL_REF'] && File.exists?("#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper") +if ENV['ZUUL_UUID'] && File.exists?("#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper") gem_checkout_method = {:path => "#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper"} else gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'}