From 147ea54374aae5593d5c4fa74e426d87fa764607 Mon Sep 17 00:00:00 2001 From: Andreas Holmsten Date: Thu, 13 Jun 2019 08:06:13 +0200 Subject: [PATCH] Cherry pick #4861 into release-2.10 (#4874) * Rebase only on PRs (#4861) * Rebase from release-2.10 branch instead of master --- 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..49e5e98de 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 release-2.10 +fi