From e1951ebe8c1cb8f5bfb6a20dccb7cbcc8712201d Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 30 Aug 2020 22:57:45 +0200 Subject: [PATCH] Use openstack_spec_helper from zuul checkout Change-Id: Idba1ab07dcba24d5662f46d00acbac531c6cbab2 --- Gemfile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 8c7a257b..3f465614 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,23 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test, :system_tests do - if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper' - gem 'puppet-openstack_spec_helper', - :path => '../..', + spec_helper_dir = '/home/zuul/src/opendev.org/openstack/puppet-openstack_spec_helper' + if File.directory?(spec_helper_dir) + if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper' + gem 'puppet-openstack_spec_helper', + :path => '../..', :require => 'false' + else + gem 'puppet-openstack_spec_helper', + :path => spec_helper_dir, + :require => 'false' + end else + spec_helper_version = ENV['ZUUL_BRANCH'] || "master" gem 'puppet-openstack_spec_helper', - :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper', - :require => 'false' + :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper', + :ref => spec_helper_version, + :require => 'false' end end