From 16bb62e795909a6e485777403588b4e02c747554 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 21 Aug 2012 15:46:15 -0700 Subject: [PATCH] Find nosetests result.html file in sub dirs. Some projects run nosetests in a subdir of the workspace directory. When they do this the results file is output in that sub dir. Find results.html in these cases when SCPing using the ** glob. Change-Id: Ic83cc69881aba3c53b027317ab5e525d028bb95e Reviewed-on: https://review.openstack.org/11774 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../files/jenkins_job_builder/config/python-jobs.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 0327858815..ed458fe495 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,8 +116,8 @@ site: 'static.openstack.org' files: - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - source: 'results.html' - keep-hierarchy: true + source: '**/*results.html' + keep-hierarchy: false copy-after-failure: true - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' copy-console: true @@ -161,8 +161,8 @@ site: 'static.openstack.org' files: - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - source: 'results.html' - keep-hierarchy: true + source: '**/*results.html' + keep-hierarchy: false copy-after-failure: true - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' copy-console: true