From 63b209e1a0f09799c696200aa8b03d01e4433f2c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 22 Aug 2012 08:58:00 -0700 Subject: [PATCH] Output nose html results to nose_results.html. The **/*results.html glob matched more than just the nose results file in some cases. Change the nose output file to nose_results.html and the glob to **/*nose_results.html to be more specific. This should prevent unwanted files from being copied into the offsite logs. Change-Id: I3e5b3d140bb0a540d7bdcab84aa70ed324e100da Reviewed-on: https://review.openstack.org/11804 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- modules/jenkins/files/slave_scripts/run-tox.sh | 1 + .../files/jenkins_job_builder/config/python-bitrot-jobs.yaml | 4 ++-- .../files/jenkins_job_builder/config/python-jobs.yaml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index 2197580842..0f22e42175 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -24,6 +24,7 @@ venv=py$version export NOSE_WITH_XUNIT=1 export NOSE_WITH_HTML_OUTPUT=1 +export NOSE_HTML_OUT_FILE='nose_results.html' tox -e$venv result=$? diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml index eb7703fe14..a5b5f8207b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml @@ -25,7 +25,7 @@ site: 'static.openstack.org' files: - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - source: '**/*results.html' + source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' @@ -69,7 +69,7 @@ site: 'static.openstack.org' files: - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - source: '**/*results.html' + source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index ed458fe495..fa588d844f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -116,7 +116,7 @@ site: 'static.openstack.org' files: - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - source: '**/*results.html' + source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' @@ -161,7 +161,7 @@ site: 'static.openstack.org' files: - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - source: '**/*results.html' + source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'