From 6bc12f6231a621cfe221408e6b57282324626858 Mon Sep 17 00:00:00 2001
From: Hengqing Hu <hudayou@hotmail.com>
Date: Sun, 13 Jan 2013 22:31:56 +0800
Subject: [PATCH] Add coverage-log(-post) macros to reduce duplication

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
---
 .../jenkins_job_builder/config/heat.yaml      | 16 ++-----------
 .../jenkins_job_builder/config/macros.yaml    | 24 +++++++++++++++++--
 .../config/python-jobs.yaml                   |  8 +------
 .../jenkins_job_builder/config/zuul.yaml      |  8 +------
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
index 804d131122..04326f11a7 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
@@ -10,13 +10,7 @@
       - coverage
 
     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
+      - coverage-log
       - console-log
 - job:
     name: 'dev-python-heatclient-coverage'
@@ -30,11 +24,5 @@
       - coverage
 
     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
+      - coverage-log
       - console-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index ca97d05737..500fdccdf1 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -218,7 +218,6 @@
               copy-console: true
               copy-after-failure: true
 
-
 - publisher:
     name: devstack-logs
     publishers:
@@ -241,7 +240,6 @@
               keep-hierarchy: true
               copy-after-failure: true
 
-
 - publisher:
     name: devstack-complete
     publishers:
@@ -253,3 +251,25 @@
               UPSTREAM_BUILD_URL=${BUILD_URL}
               UPSTREAM_JOB_NAME=${JOB_NAME}
               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
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 d7546c9e7c..4501412ee0 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
@@ -9,13 +9,7 @@
       - coverage
 
     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
+      - coverage-log-post
       - console-log-post
 
     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 a2fe7c908f..0b5e0c8c8f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
@@ -31,11 +31,5 @@
       - coverage
 
     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
+      - coverage-log
       - console-log