opendev/puppet-cgit
Code Issues Proposed changes

Update Gemfile for Zuulv3

Browse Source 
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: I353507114874a03fe7b11599e1186bca31fb2e3f
Depends-On: https://review.openstack.org/481943
Depends-On: https://review.openstack.org/575698
Depends-On: https://review.openstack.org/570825
Depends-On: https://review.openstack.org/575852
Depends-On: https://review.openstack.org/576262
This commit is contained in:
Colleen Murphy 2018-06-03 22:49:13 +02:00
parent a44b818c21
commit 542b65f419
1 changed files with 2 additions and 2 deletions

4
Gemfile

@ -1,7 +1,7 @@
source 'https://rubygems.org'
if ENV['ZUUL_REF'] && File.exists?("#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper")
gem_checkout_method = {:path => "#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper"}
if File.exists?('/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper')
gem_checkout_method = {:path => '/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'}
else
gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'}
end