Skip to content

Commit 2ec757c

Browse files
committed
Use openstack_spec_helper from zuul checkout
Change-Id: I4574e214ef16516b97c5bb0d26026dfb04929ea4
1 parent 533055a commit 2ec757c

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

Gemfile

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
source ENV['GEM_SOURCE'] || "https://rubygems.org"
22

33
group :development, :test, :system_tests do
4-
if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
5-
gem 'puppet-openstack_spec_helper',
6-
:path => '../..',
4+
spec_helper_dir = '/home/zuul/src/opendev.org/openstack/puppet-openstack_spec_helper'
5+
if File.directory?(spec_helper_dir)
6+
if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
7+
gem 'puppet-openstack_spec_helper',
8+
:path => '../..',
9+
:require => 'false'
10+
else
11+
gem 'puppet-openstack_spec_helper',
12+
:path => spec_helper_dir,
713
:require => 'false'
14+
end
815
else
16+
spec_helper_version = ENV['ZUUL_BRANCH'] || "master"
917
gem 'puppet-openstack_spec_helper',
10-
:git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
11-
:require => 'false'
18+
:git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
19+
:ref => spec_helper_version,
20+
:require => 'false'
1221
end
1322
end
1423

0 commit comments

Comments
 (0)