opendev/system-config
Code Issues Proposed changes

Add coverage-log(-post) macros to reduce duplication

Browse Source 
Change-Id: I9d54b93ade444880bb79ed799b6b6ea95833be44
Reviewed-on: https://review.openstack.org/19578
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:
Hengqing Hu 2013-01-13 22:31:56 +08:00 committed by Jenkins
parent 15bb7e5e2c
commit 6bc12f6231
4 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
View File

@ -10,13 +10,7 @@
- coverage - coverage
publishers: publishers:
- scp: - coverage-log
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log
- job: - job:
name: 'dev-python-heatclient-coverage' name: 'dev-python-heatclient-coverage'
@ -30,11 +24,5 @@
- coverage - coverage
publishers: publishers:
- scp: - coverage-log
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log

24
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
View File

@ -218,7 +218,6 @@
copy-console: true copy-console: true
copy-after-failure: true copy-after-failure: true
- publisher: - publisher:
name: devstack-logs name: devstack-logs
publishers: publishers:
@ -241,7 +240,6 @@
keep-hierarchy: true keep-hierarchy: true
copy-after-failure: true copy-after-failure: true
- publisher: - publisher:
name: devstack-complete name: devstack-complete
publishers: publishers:
@ -253,3 +251,25 @@
UPSTREAM_BUILD_URL=${BUILD_URL} UPSTREAM_BUILD_URL=${BUILD_URL}
UPSTREAM_JOB_NAME=${JOB_NAME} UPSTREAM_JOB_NAME=${JOB_NAME}
UPSTREAM_BRANCH=${ZUUL_BRANCH} UPSTREAM_BRANCH=${ZUUL_BRANCH}
- publisher:
name: coverage-log
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
copy-after-failure: true
- publisher:
name: coverage-log-post
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_SHORT_NEWREV/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
copy-after-failure: true

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

@ -9,13 +9,7 @@
- coverage - coverage
publishers: publishers:
- scp: - coverage-log-post
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_SHORT_NEWREV/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-post - console-log-post
node: '{node}' node: '{node}'

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

@ -31,11 +31,5 @@
- coverage - coverage
publishers: publishers:
- scp: - coverage-log
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log