Merge "Use openstack_spec_helper from zuul checkout"
This commit is contained in:
commit
af025be9db
19
Gemfile
19
Gemfile
@ -1,14 +1,23 @@
|
|||||||
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
||||||
|
|
||||||
group :development, :test, :system_tests do
|
group :development, :test, :system_tests do
|
||||||
if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
|
spec_helper_dir = '/home/zuul/src/opendev.org/openstack/puppet-openstack_spec_helper'
|
||||||
gem 'puppet-openstack_spec_helper',
|
if File.directory?(spec_helper_dir)
|
||||||
:path => '../..',
|
if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
|
||||||
|
gem 'puppet-openstack_spec_helper',
|
||||||
|
:path => '../..',
|
||||||
:require => 'false'
|
:require => 'false'
|
||||||
|
else
|
||||||
|
gem 'puppet-openstack_spec_helper',
|
||||||
|
:path => spec_helper_dir,
|
||||||
|
:require => 'false'
|
||||||
|
end
|
||||||
else
|
else
|
||||||
|
spec_helper_version = ENV['ZUUL_BRANCH'] || "master"
|
||||||
gem 'puppet-openstack_spec_helper',
|
gem 'puppet-openstack_spec_helper',
|
||||||
:git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
|
:git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
|
||||||
:require => 'false'
|
:ref => spec_helper_version,
|
||||||
|
:require => 'false'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user