opendev/system-config
Code Issues Proposed changes

Merge "Put the trusty test in the Ubuntu section"

Browse Source
This commit is contained in:
Jenkins 2014-07-03 18:18:16 +00:00 committed by Gerrit Code Review
commit b2a5702f9a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -47,11 +47,7 @@ class openstack_project::jenkins_params {
$python_magic_package = 'python-magic' $python_magic_package = 'python-magic'
$python_requests_package = 'python-requests' $python_requests_package = 'python-requests'
$python_zmq_package = 'python-zmq' $python_zmq_package = 'python-zmq'
if ($::lsbdistcodename) == 'trusty' { $rubygems_package = 'rubygems'
$rubygems_package = 'ruby'
} else {
$rubygems_package = 'rubygems'
}
# Common Lisp interpreter, used for cl-openstack-client # Common Lisp interpreter, used for cl-openstack-client
$sbcl_package = 'sbcl' $sbcl_package = 'sbcl'
$sqlite_package = 'sqlite' $sqlite_package = 'sqlite'
@ -129,7 +125,11 @@ class openstack_project::jenkins_params {
$python_magic_package = 'python-magic' $python_magic_package = 'python-magic'
$python_requests_package = 'python-requests' $python_requests_package = 'python-requests'
$python_zmq_package = 'python-zmq' $python_zmq_package = 'python-zmq'
$rubygems_package = 'rubygems' if ($::lsbdistcodename) == 'trusty' {
$rubygems_package = 'ruby'
} else {
$rubygems_package = 'rubygems'
}
$ruby1_9_1_package = 'ruby1.9.1' $ruby1_9_1_package = 'ruby1.9.1'
$ruby1_9_1_dev_package = 'ruby1.9.1-dev' $ruby1_9_1_dev_package = 'ruby1.9.1-dev'
$ruby_bundler_package = 'ruby-bundler' $ruby_bundler_package = 'ruby-bundler'