C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Cherry pick #4861 into release-2.10 (#4874)

Browse source 
* Rebase only on PRs (#4861)

* Rebase from release-2.10 branch instead of master
This commit is contained in:
Andreas Holmsten 2019-06-13 08:06:13 +02:00 committed by Kubernetes Prow Robot
parent d53782a7f1
commit 147ea54374
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/scripts/rebase.sh
View file

@ -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