From 14141ec1373ab465b6dd0ed142f7db32f7e99c98 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Mon, 10 Jun 2019 21:17:05 +0300
Subject: [PATCH] Rebase only on PRs (#4861)

---
 tests/scripts/rebase.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/scripts/rebase.sh b/tests/scripts/rebase.sh
index 9a0345b56..3850ab8d3 100755
--- a/tests/scripts/rebase.sh
+++ b/tests/scripts/rebase.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -euxo pipefail
 
-# Rebase on master to get latest changes
-git config user.email "ci@kubespray.io"
-git config user.name "CI"
-git pull --rebase origin master
+# Rebase PRs on master to get latest changes
+if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then
+  git config user.email "ci@kubespray.io"
+  git config user.name "CI"
+  git pull --rebase origin master
+fi
-- 
GitLab