fix changing targe branch
This commit is contained in:
parent
136f0a184b
commit
1d1c987bac
|
@ -43,7 +43,16 @@ def pre_test(){
|
||||||
killall -9 gdb || echo "no gdb running"
|
killall -9 gdb || echo "no gdb running"
|
||||||
cd ${WKC}
|
cd ${WKC}
|
||||||
git reset --hard HEAD~10 >/dev/null
|
git reset --hard HEAD~10 >/dev/null
|
||||||
git checkout develop
|
'''
|
||||||
|
script {
|
||||||
|
if (env.CHANGE_TARGET == 'master') {
|
||||||
|
sh 'git checkout master'
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
sh 'git checkout develop'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sh'''
|
||||||
git pull >/dev/null
|
git pull >/dev/null
|
||||||
git fetch origin +refs/pull/${CHANGE_ID}/merge
|
git fetch origin +refs/pull/${CHANGE_ID}/merge
|
||||||
git checkout -qf FETCH_HEAD
|
git checkout -qf FETCH_HEAD
|
||||||
|
|
Loading…
Reference in New Issue