opendev/system-config
Code Issues Proposed changes

Use console-log scp macro to copy build logs.

Browse Source 
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 <mordred@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-09-06 15:29:18 -07:00 committed by Jenkins
parent 1f0386fc0a
commit 7075bbb146
4 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
View File

@ -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

8
modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
View File

@ -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:

14
modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
View File

@ -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}'

4
modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
View File

@ -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