Skip to content

Commit

Permalink
ci: remove left overs from previous rebase
Browse files Browse the repository at this point in the history
If previous run of a PR failed to rebase, the code was left in rebase
in progress and was not correctly overwritten by new changes in the
patches.
  • Loading branch information
pbrezina committed Aug 23, 2019
1 parent 820151f commit 2a145ef
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Jenkinsfile
Expand Up @@ -122,6 +122,18 @@ class CI {
ctx.env.CHANGE_TARGET
)

// Remove left overs from previous rebase if there are any
ctx.sh String.format(
'git -C %s rebase --abort || :',
"${ctx.env.WORKSPACE}/sssd"
)

// Just to be sure
ctx.sh String.format(
'rm -fr "%s/.git/rebase-apply || :',
"${ctx.env.WORKSPACE}/sssd"
)

ctx.sh String.format(
'git -C %s rebase origin/%s',
"${ctx.env.WORKSPACE}/sssd",
Expand Down

0 comments on commit 2a145ef

Please sign in to comment.