From 57b86f4559f5c7293eddb484f783c67539e6f898 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 20 Mar 2020 17:00:39 +0100 Subject: centos-ci: rebase against the PR target branch instead of master Needs https://github.com/gluster/centosci/pull/83 for the ghprbTargetBranch variable to be set. Signed-off-by: Michael Adam --- samba-integration-centos-ci-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samba-integration-centos-ci-tests.sh b/samba-integration-centos-ci-tests.sh index 933b02b..6593bd7 100755 --- a/samba-integration-centos-ci-tests.sh +++ b/samba-integration-centos-ci-tests.sh @@ -55,9 +55,9 @@ then git fetch origin "pull/${ghprbPullId}/head:pr_${ghprbPullId}" git checkout "pr_${ghprbPullId}" - git rebase master + git rebase "${ghprbTargetBranch}" if [ $? -ne 0 ] ; then - echo "Unable to automatically merge master. Please rebase your patch" + echo "Unable to automatically rebase to branch '${ghprbTargetBranch}'. Please rebase your PR!" exit 1 fi fi -- cgit