opendev/system-config
Code Issues Proposed changes

Remove global python-subunit install.

Browse Source 
The global python-subunit install that was used for subunit log
processing is interfering with the version desired for nova because nova
enabled sitepackages.

Remove the global install and use the local virtualenv install of
python-subunit to process subunit logs. This ensures compatibility with
testrepository and the subunit logs themselves.

Change-Id: Id634b7f96bcdb594242c0ae5734f77a9fdf5425c
Reviewed-on: https://review.openstack.org/26396
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-04-08 11:30:30 -07:00 committed by Jenkins
parent 46ebb448c1
commit 9c2072f525
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/jenkins/files/slave_scripts/run-tox.sh
View File

@ -51,7 +51,7 @@ echo "======================================================================"
if [ -f ".testrepository/0" ] if [ -f ".testrepository/0" ]
then then
cp .testrepository/0 ./subunit_log.txt cp .testrepository/0 ./subunit_log.txt
/usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html .tox/$venv/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html
gzip -9 ./subunit_log.txt gzip -9 ./subunit_log.txt
gzip -9 ./testr_results.html gzip -9 ./testr_results.html
fi fi

7
modules/jenkins/manifests/slave.pp
View File

@ -107,7 +107,6 @@ class jenkins::slave(
# Packages that need to be installed from pip # Packages that need to be installed from pip
$pip_packages = [ $pip_packages = [
'python-subunit',
'setuptools-git', 'setuptools-git',
'tox', 'tox',
] ]
@ -118,6 +117,12 @@ class jenkins::slave(
require => Class[pip], require => Class[pip],
} }
package { 'python-subunit':
ensure => absent,
provider => pip,
require => Class[pip],
}
package { 'git-review': package { 'git-review':
ensure => '1.17', ensure => '1.17',
provider => pip, provider => pip,