From e93d8f55ee5bc98705277f1933b176fb97c93b8a Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Thu, 12 Jul 2018 09:57:45 +0200 Subject: [PATCH] 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: If01c1b3eb22bc3c751c6a13eafea369a7cef4e49 --- Gemfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fbec945..019213a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,15 @@ source 'https://rubygems.org' +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 +gem_checkout_method[:require] = false + group :development, :test, :system_tests do gem 'puppet-openstack_infra_spec_helper', - :git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper', - :require => false - # Not all modules can do this, so we add it here to the ones that can - gem 'puppet-lint-empty_string-check' + gem_checkout_method end # vim:ft=ruby