From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 15 Dec 2015 01:03:54 +0000 (+0000)
Subject: Merge "Make test-integration to rebase before build"
X-Git-Tag: release/beryllium~267
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6c1d80c8f530707dd94960c4a924127c8e96c16a;p=releng%2Fbuilder.git

Merge "Make test-integration to rebase before build"
---

6c1d80c8f530707dd94960c4a924127c8e96c16a
diff --cc jjb/integration/integration-macros.yaml
index d3b0ce255,d1c54ce3c..8775f2752
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@@ -323,9 -308,18 +323,19 @@@
      name: integration-cleanup-workspace
      builders:
          - shell:
 -            !include-raw include-raw-integration-cleanup-workspace.sh
 +            !include-raw:
 +                - include-raw-integration-cleanup-workspace.sh
  
+ # Macro: integration-rebase-patch
+ # Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH.
+ # Used by: integration-patch-distribution-* job template
+ 
+ - builder:
+     name: integration-rebase-gerrit-patch
+     builders:
+         - shell:
+             !include-raw include-raw-integration-rebase-gerrit-patch.sh
+ 
  ##############
  # Publishers #
  ##############