Florian Ruynat
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
8 additions and
2 deletions
-
tests/scripts/rebase.sh
|
|
@ -1,9 +1,15 @@ |
|
|
#!/bin/bash |
|
|
#!/bin/bash |
|
|
set -euxo pipefail |
|
|
set -euxo pipefail |
|
|
|
|
|
|
|
|
# Rebase PRs on master to get latest changes |
|
|
|
|
|
|
|
|
KUBESPRAY_NEXT_VERSION=2.$(( ${KUBESPRAY_VERSION:3:2} + 1 )) |
|
|
|
|
|
|
|
|
|
|
|
# Rebase PRs on master (or release branch) to get latest changes |
|
|
if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then |
|
|
if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then |
|
|
git config user.email "ci@kubespray.io" |
|
|
git config user.email "ci@kubespray.io" |
|
|
git config user.name "CI" |
|
|
git config user.name "CI" |
|
|
git pull --rebase origin master |
|
|
|
|
|
|
|
|
if [[ -z "`git branch -a --list origin/release-$KUBESPRAY_NEXT_VERSION`" ]]; then |
|
|
|
|
|
git pull --rebase origin master |
|
|
|
|
|
else |
|
|
|
|
|
git pull --rebase origin release-$KUBESPRAY_NEXT_VERSION |
|
|
|
|
|
fi |
|
|
fi |
|
|
fi |
