Merge "Make test-integration to rebase before build"

diff --cc jjb/integration/integration-macros.yaml
index d3b0ce2552d6606e9b30ad9dfef9c7e38afcc29d,d1c54ce3cb7ab1adc63325d7d5b2f30dc460acd1..8775f275217b71832ef0d13f0a66d39f48b0c6bb
--- 1/jjb/integration/integration-macros.yaml
--- 2/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 #
  ##############

diff --cc jjb/integration/integration-test-jobs.yaml
Simple merge