Remove global python-subunit install.
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:
@ -51,7 +51,7 @@ echo "======================================================================"
|
||||
if [ -f ".testrepository/0" ]
|
||||
then
|
||||
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 ./testr_results.html
|
||||
fi
|
||||
|
@ -107,7 +107,6 @@ class jenkins::slave(
|
||||
|
||||
# Packages that need to be installed from pip
|
||||
$pip_packages = [
|
||||
'python-subunit',
|
||||
'setuptools-git',
|
||||
'tox',
|
||||
]
|
||||
@ -118,6 +117,12 @@ class jenkins::slave(
|
||||
require => Class[pip],
|
||||
}
|
||||
|
||||
package { 'python-subunit':
|
||||
ensure => absent,
|
||||
provider => pip,
|
||||
require => Class[pip],
|
||||
}
|
||||
|
||||
package { 'git-review':
|
||||
ensure => '1.17',
|
||||
provider => pip,
|
||||
|
Reference in New Issue
Block a user