From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 20 May 2021 23:28:25 +0000 (-0400)
Subject: script/build-integration-branch: always generate merge commits
X-Git-Tag: v17.1.0~1882^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41464%2Fhead;p=ceph.git

script/build-integration-branch: always generate merge commits

This guarantees we'll always get a new sha1, so shaman will generate a
new build even if the same PRs are pushed to more than one branch.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/script/build-integration-branch b/src/script/build-integration-branch
index 0450f6a34113..9ff5b4e3e633 100755
--- a/src/script/build-integration-branch
+++ b/src/script/build-integration-branch
@@ -94,7 +94,7 @@ for pr in prs:
     pr_ref = pr['head']['ref']
     print(f'--- pr {pr_number} --- pulling {pr_url} branch {pr_ref}')
     while True:
-        r = call(['git', 'pull', '--no-edit', pr_url, pr_ref])
+        r = call(['git', 'pull', '--no-ff', '--no-edit', pr_url, pr_ref])
         if r == 0:
             break
         elif r == 1: