Merge "Update cookbook references for berkshelf"
This commit is contained in:
commit
1a6d4a8c49
@ -21,6 +21,5 @@ source 'https://supermarket.chef.io'
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
cookbook 'openstack-dns', github: 'cloudbau/cookbook-openstack-dns'
|
cookbook 'openstackclient', git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
|
||||||
cookbook 'openstackclient', github: 'cloudbau/cookbook-openstackclient'
|
|
||||||
cookbook 'statsd', github: 'librato/statsd-cookbook'
|
cookbook 'statsd', github: 'librato/statsd-cookbook'
|
||||||
|
13
Rakefile
13
Rakefile
@ -4,7 +4,7 @@ client_opts = "--force-formatter --no-color -z --config #{current_dir}/.chef/kni
|
|||||||
task default: ['test']
|
task default: ['test']
|
||||||
|
|
||||||
desc 'Default gate tests to run'
|
desc 'Default gate tests to run'
|
||||||
task test: [:rubocop, :berks_vendor, :json_check]
|
task test: %i(rubocop berks_vendor json_check)
|
||||||
|
|
||||||
def run_command(command)
|
def run_command(command)
|
||||||
if File.exist?('Gemfile.lock')
|
if File.exist?('Gemfile.lock')
|
||||||
@ -80,18 +80,21 @@ def _run_env_queries
|
|||||||
_run_commands('basic common env queries', {
|
_run_commands('basic common env queries', {
|
||||||
'uname' => ['-a'],
|
'uname' => ['-a'],
|
||||||
'pwd' => [''],
|
'pwd' => [''],
|
||||||
'env' => [''] },
|
'env' => [''],
|
||||||
|
},
|
||||||
false)
|
false)
|
||||||
case @platform
|
case @platform
|
||||||
when 'ubuntu16'
|
when 'ubuntu16'
|
||||||
_run_commands('basic debian env queries', {
|
_run_commands('basic debian env queries', {
|
||||||
'ifconfig' => [''],
|
'ifconfig' => [''],
|
||||||
'cat' => ['/etc/apt/sources.list'] },
|
'cat' => ['/etc/apt/sources.list'],
|
||||||
|
},
|
||||||
false)
|
false)
|
||||||
when 'centos7'
|
when 'centos7'
|
||||||
_run_commands('basic rhel env queries', {
|
_run_commands('basic rhel env queries', {
|
||||||
'/usr/sbin/ip' => ['addr'],
|
'/usr/sbin/ip' => ['addr'],
|
||||||
'cat' => ['/etc/yum.repos.d/*'] },
|
'cat' => ['/etc/yum.repos.d/*'],
|
||||||
|
},
|
||||||
false)
|
false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -132,7 +135,7 @@ def _save_logs(prefix, log_dir)
|
|||||||
end
|
end
|
||||||
|
|
||||||
desc 'Integration test on Infra'
|
desc 'Integration test on Infra'
|
||||||
task integration: [:create_key, :berks_vendor] do
|
task integration: %i(create_key berks_vendor) do
|
||||||
log_dir = ENV['WORKSPACE'] + '/logs'
|
log_dir = ENV['WORKSPACE'] + '/logs'
|
||||||
sh %(mkdir #{log_dir})
|
sh %(mkdir #{log_dir})
|
||||||
# This is a workaround for allowing chef-client to run in local mode
|
# This is a workaround for allowing chef-client to run in local mode
|
||||||
|
Loading…
Reference in New Issue
Block a user