Merge "Make test-integration to rebase before build"

diff --git a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
new file mode 100644 (file)
index 0000000..96dca8a
--- /dev/null
+++ b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
@@ -0,0 +1,10 @@
+# Make sure changes merged after patch creation are applied.
+
+set -exu
+echo "Rebase the patch on top of ${GERRIT_PROJECT}"
+cd "${GERRIT_PROJECT}"
+export EMAIL="sandbox@jenkins.opendaylight.org"
+# TODO: Is there a more appropriate e-mail?
+export GIT_COMMITTER_NAME="Rebase Macro"
+git rebase "origin/${BRANCH}"
+cd "${WORKSPACE}"

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index d3b0ce2552d6606e9b30ad9dfef9c7e38afcc29d..8775f275217b71832ef0d13f0a66d39f48b0c6bb 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -326,6 +326,16 @@
             !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 --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index ba634e84aaa0ab4d08cff2be4e1e8933c0f6aea1..4ca9326efc1db5290fce22a5ed4351020f460a06 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -322,6 +322,8 @@
             refspec: '$GERRIT_REFSPEC'
         - project-parameter:
             project: '$GERRIT_PROJECT'
+        - integration-branch:
+            branch: '{branch}'
         - integration-distribution-git-url
 
     scm:
@@ -359,6 +361,7 @@
                 notbuilt: true
 
     prebuilders:
+        - integration-rebase-gerrit-patch
         - integration-get-bundle-url
         - inject:
             properties-file: 'bundle.txt'