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 61cc962612b4ff7e3ecdf9a5ae5d90336f204d86..842f3bb3e2f9458c41a98e576db85c6d1ddd4242 100644 (file)
--- 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 b8fa1996e04859447e218a4d1b49209f296cbea3..08b9822184b1d6096a950fed34f8f6ea5a61c8a5 100644 (file)
--- 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 d5755b85804bf8377b1804eb9a76e18431fbeff1..2af375ba3782827da0c8e6e16fba67c9b3126693 100644 (file)
--- 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 14e6979ae7826da8554861242f65a282274b3ebf..db13fb67041add0bbf4cf7f0c97d0fdbe505a11b 100644 (file)
--- 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 c6de39a151a9b0ab85c21fd5bb68e6b5983db41b..4f517a428fb169a4a27c052f9290b0578315c4e8 100644 (file)
--- 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 8dbfa7ff6fa6943f4523d54a22c41d54c114dde6..f956082d2cafdacb77b78b6ce47d1dee80fd4db4 100644 (file)
--- 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 b5d40ac0210e5c9246d174b792a4d8ca87f8e415..ec7f7098d76315cbc83e3e1d5a871fe61a76e082 100644 (file)
--- 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 113de96e1178128d617b164c8edea04eea3b929a..89431b285a752d5980e4a6dff006db8177546dda 100644 (file)
--- 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 c19d4c2ed358aec6847e756a2171dbc3be59105f..0efacba61fabeecd4ea9b415f4e30dfff1905086 100644 (file)
--- 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 90e755d15d8e870625917ae2cd5645e08cc557d6..c29f1af3aac3d0862b2df61fdf1a163e74bbe6a7 100644 (file)
--- 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