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
commit785e18decb8339ecb591a1acc8352036316bd8e9 (patch)
tree0e2d5e80479af4911a661ac770c3a4e55411af40
parent4832918302517df678a648d42f0bb4af65bd8678 (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: I186e6963cd028354676c4e1240d0971adcd9b476
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 19:08:46 +0000 Reviewed-on: https://review.openstack.org/582013 Project: openstack-infra/puppet-ethercalc 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