summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2018-07-12 09:57:46 +0200
committerColleen Murphy <colleen@gazlene.net>2018-07-12 09:57:46 +0200
commit241a60c5fab771794765369da72a4613feddb064 (patch)
tree56499063a734fa318546bd4478c6b8e0aedd21a8
parent33fcbde4b28e3890bc75cf2642fc0801ef27374d (diff)
Update Gemfile for Zuulv3
The logic in the Gemfile was relying on Zuulv2 variables to find out whether the spec helper gem was already available on disk, and since Zuulv3 has changed things it was failing to find it and downloading the master version instead. This patch ensures the Gemfile looks for the gem in the right place when running in CI. Change-Id: Ieb08b1c3d5e9400657631a97fc4ce6ea8a5763e6
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 16 Jul 2018 21:36:32 +0000 Reviewed-on: https://review.openstack.org/582068 Project: openstack-infra/puppet-storyboard Branch: refs/heads/master
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 9854cc9..019213a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
1source 'https://rubygems.org' 1source 'https://rubygems.org'
2 2
3if ENV['ZUUL_REF'] && File.exists?("#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper") 3if File.exists?('/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper')
4 gem_checkout_method = {:path => "#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper"} 4 gem_checkout_method = {:path => '/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'}
5else 5else
6 gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'} 6 gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'}
7end 7end