X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-rebase-gerrit-patch.sh;h=b1fbae329b511a647a37389de6597bf4e1541fcb;hb=7959ac36b9d24f2f8e81d9dfb89fe5c404441df8;hp=96dca8ae8a63b7f6f34a0ac59945694ad6b265ea;hpb=612c8798ee9384a68225ad671f230b616dbada08;p=releng%2Fbuilder.git diff --git a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh index 96dca8ae8..b1fbae329 100644 --- a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh +++ b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh @@ -1,3 +1,4 @@ +#!/bin/bash # Make sure changes merged after patch creation are applied. set -exu @@ -6,5 +7,5 @@ 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}" +git rebase "origin/${DISTROBRANCH}" cd "${WORKSPACE}"