diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index 1bb2e05d70..6909c37d6c 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -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 diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 18ca0ec438..95e7197100 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -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,