Browse Source

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: I5a5c8613bf637f15d7a14481961991d242339d3c
Colleen Murphy 10 months ago
parent
commit
8158fd4cca
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      Gemfile

+ 2
- 2
Gemfile View File

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

Loading…
Cancel
Save