From 7075bbb1463763ba76faa46d22b3e8092c18b1cf Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 6 Sep 2012 15:29:18 -0700 Subject: [PATCH] Use console-log scp macro to copy build logs. Previoulsy we had spelled out that the build logs should be copied when there were other files to copy in order to avoid multiple SCP connections. Now, in order to copy the entire console log, we need multiple SCP connections anyways so go back to using the console-log macros for simplicity and consistency. Change-Id: I6e88d08f7eec945b907353ed90ac0d482b7a9c9a Reviewed-on: https://review.openstack.org/12532 Reviewed-by: Monty Taylor Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../config/devstack-gate.yaml | 16 ++++------------ .../config/python-bitrot-jobs.yaml | 8 ++------ .../jenkins_job_builder/config/python-jobs.yaml | 14 ++++---------- .../files/jenkins_job_builder/config/zuul.yaml | 4 +--- 4 files changed, 11 insertions(+), 31 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 6bf18f1da5..90fe016e4c 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -60,9 +60,7 @@ source: 'logs/*' keep-hierarchy: true copy-after-failure: true - - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log - trigger-parameterized-builds: - project: devstack-update-complete when: complete @@ -132,9 +130,7 @@ source: 'logs/*' keep-hierarchy: true copy-after-failure: true - - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log - trigger-parameterized-builds: - project: devstack-update-complete when: complete @@ -198,9 +194,7 @@ source: 'logs/*' keep-hierarchy: true copy-after-failure: true - - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log-periodic - trigger-parameterized-builds: - project: devstack-update-complete when: complete @@ -264,9 +258,7 @@ source: 'logs/*' keep-hierarchy: true copy-after-failure: true - - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log-periodic - trigger-parameterized-builds: - project: devstack-update-complete when: complete 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 bcf6a79c05..96d8566eb0 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 @@ -15,9 +15,7 @@ source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log-periodic scm: - git: @@ -46,9 +44,7 @@ source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log-periodic scm: - git: 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 8347d55ed3..7842596b44 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 @@ -12,13 +12,11 @@ - scp: site: 'static.openstack.org' files: - - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' + - target: 'logs/$ZUUL_SHORT_NEWREV/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' source: 'cover/**' keep-hierarchy: true copy-after-failure: true - - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log-post node: '{node}' @@ -75,9 +73,7 @@ source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log # >= precise does not have python2.6 node: oneiric @@ -107,9 +103,7 @@ source: '**/*nose_results.html' keep-hierarchy: false copy-after-failure: true - - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log node: '{node}' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml index bdaf1a083e..3c673697e0 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml @@ -38,6 +38,4 @@ source: 'cover/**' keep-hierarchy: true copy-after-failure: true - - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - copy-console: true - copy-after-failure: true + - console-log-post