summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2018-07-12 09:57:44 +0200
committerColleen Murphy <colleen@gazlene.net>2018-07-12 09:57:44 +0200
commitef0cdf4998f0ca8dba19ccfe517929a34820aa40 (patch)
tree57d70ec36eba3b8e1c559ebf9370cbb6c2be1645
parentc089b950bc84ed8d73b9ae20a04ad87fcaa2f6eb (diff)
Update Gemfile for Zuulv3HEADmaster
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: Ic1f276662ae78df46c63dfa67fac376c43e44b66
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 22:58:55 +0000 Reviewed-on: https://review.openstack.org/582023 Project: openstack-infra/puppet-haveged 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