From ca76aeca55f0fda97644eedef4b86e017209907c Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Wed, 7 Apr 2021 23:36:04 +0200 Subject: Add automatic update of next branch After a merge we need to rebase our -next branch to be synced with master. Bug-AGL: SPEC-3846 Signed-off-by: Jan-Simon Moeller Change-Id: I9881589ec192ccf1668e692ea9d4e1eb6476d418 --- jjb/common/include-agl-update-next.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 jjb/common/include-agl-update-next.sh (limited to 'jjb/common/include-agl-update-next.sh') diff --git a/jjb/common/include-agl-update-next.sh b/jjb/common/include-agl-update-next.sh new file mode 100644 index 00000000..266f9bc1 --- /dev/null +++ b/jjb/common/include-agl-update-next.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# safety net +if test x"master" = x"${TARGETBRANCH}" ; then + pushd $MYPROJECT + git config --local --add gitreview.username agl-jobbuilder + git config --local --add user.email collab-it+agl-jobbuilder@linuxfoundation.org + pip3 install git-review + export PATH=/home/jenkins/.local/bin:$PATH + git review -s + git remote -v update + git checkout -b next gerrit/next + git rebase gerrit/master + git push -f gerrit HEAD:next -f + popd +fi + +cd .. +rm -rf repoclone -- cgit 1.2.3-korg