From ae3c1d1553570e704ddd88fcf5d96f2d64ae8fff Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 8 Nov 2017 11:24:17 -0500
Subject: [PATCH] Switch to using global-jjb lf-jacoco-report macro

Change-Id: Ifae2fcb2d506a2158a3c2211e8d04505d3821813
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 .../distribution/distribution-jobs.yaml         |  4 ++--
 jjb/ovsdb/ovsdb-sonar.yaml                      |  2 +-
 jjb/releng-macros.yaml                          | 17 -----------------
 jjb/releng-templates-java.yaml                  |  4 ++--
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index d1771099e..097cc4127 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -63,7 +63,7 @@
 
     publishers:
       - findbugs
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
@@ -180,7 +180,7 @@
           id: ''
           unique-version: true
           deploy-unstable: false
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index fd529707c..67ba74dad 100644
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -97,5 +97,5 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 485a4ec3d..64ce604c3 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -281,23 +281,6 @@
           send-to:
             - recipients
 
-- publisher:
-    name: jacoco-report
-    publishers:
-      - jacoco:
-          exec-pattern: "**/**.exec"
-          class-pattern: "**/classes"
-          source-pattern: "**/src/main/java"
-          exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
-          status-update: true
-          targets:
-            - branch:
-                healthy: 10
-                unhealthy: 20
-            - method:
-                healthy: 50
-                unhealthy: 40
-
 - builder:
     # Deploys a maven site to Nexus using lftools nexus-zip command
     name: opendaylight-infra-deploy-maven-site
diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 81fb50331..d9ee34086 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -54,7 +54,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '{email-upstream}'
       - findbugs
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
 
 - job-template:
@@ -158,7 +158,7 @@
           id: ''
           unique-version: true
           deploy-unstable: false
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - trigger:
           project: 'distribution-merge-{stream}'
-- 
2.36.6