From bbae6c2e38c69353e5c944da37435d297ea4629d Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Sun, 30 Aug 2020 23:08:40 +0200
Subject: [PATCH] Use openstack_spec_helper from zuul checkout

Change-Id: Id7f17000614aecf2e1c884ce7af54cb5dcd93226
---
 Gemfile | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8c7a257..3f46561 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