opendev/system-config
Code Issues Proposed changes

Install libsystemd-{journal}-dev on proposal slave

Browse Source 
The periodic jobs are failing because headers are missing. For trusty
and older, the package is called libsystemd-journal-dev, for others
libsystemd-dev.

Details:
http://logs.openstack.org/periodic/propose-requirements-constraints-master/52c7815/console.html#_2017-04-13_08_35_22_751929

Change-Id: If207dbeb863b744bd5364f70c901bb16e99c7d08
This commit is contained in:
Dirk Mueller 2017-04-13 21:46:58 +02:00
parent 2b58aa6a79
commit 8f3f16cd00
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ class openstack_project::jenkins_params {
$swig = "swig" $swig = "swig"
$libjpeg_dev = "libjpeg-turbo-devel" $libjpeg_dev = "libjpeg-turbo-devel"
$zlib_dev = "zlib-devel" $zlib_dev = "zlib-devel"
$systemd_dev = 'systemd-devel'
} }
'Debian': { 'Debian': {
# packages needed by slaves # packages needed by slaves
@ -117,8 +118,10 @@ class openstack_project::jenkins_params {
$libffi_dev_package = 'libffi-dev' $libffi_dev_package = 'libffi-dev'
if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') { if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
$maven_package = 'maven' $maven_package = 'maven'
$systemd_dev = 'libsystemd-dev'
} else { } else {
$maven_package = 'maven2' $maven_package = 'maven2'
$systemd_dev = 'libsystemd-journal-dev'
} }
# For tooz unit tests # For tooz unit tests
$memcached_package = 'memcached' $memcached_package = 'memcached'

1
modules/openstack_project/manifests/thick_slave.pp
View File

@ -48,6 +48,7 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::libjpeg_dev, # for sphinx Pillow dep $::openstack_project::jenkins_params::libjpeg_dev, # for sphinx Pillow dep
$::openstack_project::jenkins_params::zlib_dev, # for sphinx Pillow dep $::openstack_project::jenkins_params::zlib_dev, # for sphinx Pillow dep
$::openstack_project::jenkins_params::nss_devel, # for python-nss $::openstack_project::jenkins_params::nss_devel, # for python-nss
$::openstack_project::jenkins_params::systemd_dev, # for systemd-python
] ]
package { $packages: package { $packages: