From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 27 Jun 2016 19:58:08 +0000 (-0400)
Subject: Move /tmp/r/org/opendaylight cleanup to archieve-builds macro
X-Git-Tag: release/beryllium-sr3~261
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F40893%2F1;p=releng%2Fbuilder.git

Move /tmp/r/org/opendaylight cleanup to archieve-builds macro

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

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 61cc962612..842f3bb3e2 100644
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -32,7 +32,6 @@
         - timed: 'H H * * 6'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: 'JENKINS_SETTINGS'
diff --git a/jjb-templates/distribution-check.yaml b/jjb-templates/distribution-check.yaml
index b8fa1996e0..08b9822184 100644
--- a/jjb-templates/distribution-check.yaml
+++ b/jjb-templates/distribution-check.yaml
@@ -71,7 +71,6 @@
                 notbuilt: false
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index d5755b8580..2af375ba37 100644
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -37,7 +37,6 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: 'JENKINS_SETTINGS'
diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index 14e6979ae7..db13fb6704 100644
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -44,7 +44,6 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index c6de39a151..4f517a428f 100644
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -47,7 +47,6 @@
             branch: '{branch}'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
diff --git a/jjb-templates/periodic.yaml b/jjb-templates/periodic.yaml
index 8dbfa7ff6f..f956082d2c 100644
--- a/jjb-templates/periodic.yaml
+++ b/jjb-templates/periodic.yaml
@@ -41,7 +41,6 @@
         - timed: '@daily'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index b5d40ac021..ec7f7098d7 100644
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -34,7 +34,6 @@
             name: 'PROJECT_PATH'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
diff --git a/jjb-templates/validate-autorelease.yaml b/jjb-templates/validate-autorelease.yaml
index 113de96e11..89431b285a 100644
--- a/jjb-templates/validate-autorelease.yaml
+++ b/jjb-templates/validate-autorelease.yaml
@@ -73,7 +73,6 @@
                       pattern: '**/*.xml'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index c19d4c2ed3..0efacba61f 100644
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -55,7 +55,6 @@
             branch: '{branch}'
 
     builders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 90e755d15d..c29f1af3aa 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -278,6 +278,8 @@
                         global-settings-type: cfp
                 - description-setter:
                     regexp: '^Build logs: .*'
+                # Cleanup after ourselves
+                - wipe-org-opendaylight-repo
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True