Migrate to lf-jacoco-nojava-workaround

Allows us to remove the locally maintained copy of this macro.

Change-Id: I33320cac9ab9ce0c852769e7f4130c0130837a8c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 3d5bd1d66ee4feb1d9153d7f1aa3747d81b93a1d..69c2e09d66eed37a760f0b26522ebf627970ebb7 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -130,7 +130,7 @@
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - wipe-local-maven-repo
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
       - autorelease-cfp:
@@ -543,7 +543,7 @@
       - lf-infra-pre-build
       - autorelease-checkout-gerrit-patch
       - autorelease-compare-projects
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
       - autorelease-generate-release-patches

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 9ab88f4895354ad446f3d750f1ea29cb680e8522..5b5016899dd7aad4b98e73e24f4554c6063cb7df 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -240,7 +240,7 @@
 
     prebuilders:
       - wipe-org-opendaylight-repo
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index e110e35a979ee06687a1e8181c998c660d895676..8f02b5d3eb0b469694cb00e75eac9bec3bbad8cd 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -164,7 +164,7 @@
           maven-version: 'mvn33'
           stream: '{stream}'
           OVS_VERSION: '2.5.0'
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 257c99ab03b71a69afd984303e69675992437342..428a5e14b6dfcbb102e5b326d4f6a4789fe762be 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -104,7 +104,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: !include-raw-escape: cleanup-docker.sh
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 789346582d90cd3a304e874bec6e41748ed21df0..d309886801d5c39c528cb92ab6bb4ccfd2260d7f 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -336,11 +336,6 @@
     builders:
       - shell: 'if [ -d /tmp/r ]; then rm -rf /tmp/r; fi'
 
-- builder:
-    name: jacoco-nojava-workaround
-    builders:
-      - shell: 'mkdir -p $WORKSPACE/target/classes $WORKSPACE/jacoco/classes'
-
 - builder:
     name: provide-maven-settings
     builders:

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 71c089c7b14565bee237de6e88104f18e3d1aa1c..cf1ac426ab0b13fcf1171d909dcf2a4b1273ed50 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -77,7 +77,7 @@
           result: 'success'
 
     builders:
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -166,7 +166,7 @@
           forbidden-files: ''
 
     prebuilders:
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'