[
https://issues.apache.org/jira/browse/YETUS-812?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16795202#comment-16795202
]
Allen Wittenauer edited comment on YETUS-812 at 3/18/19 4:50 PM:
-----------------------------------------------------------------
Finally circling back on this issue, after hitting it with one of our private
source repos again this morning. I think this might be easier to solve than I
originally thought, at least for a certain number of cases where it gets hit.
When ROBOT=true (i.e., under automated CI), test-patch should probably
re-arrange the ordering a bit such that test-patch tries to do something remote
but non-destructive before switching to master (fetch tags?). If that fails,
then just trust that the repo is set to the branch that the CI system told us
it is and forcibly reset that particular branch's pointer.
was (Author: aw):
Finally circling back on this issue, after hitting it with one of our private
source repos again this morning. I think this might be easier to solve than I
think, at least for a certain number of cases where it gets hit.
When ROBOT=true (i.e., under automated CI), test-patch should probably
re-arrange the ordering a bit such that test-patch tries to do something remote
but non-destructive before switching to master (fetch tags?). If that fails,
then just trust that the repo is set to the branch that the CI system told us
it is and forcibly reset that particular branch's pointer.
> git pull needs to happen but doesnt on branch builds
> ----------------------------------------------------
>
> Key: YETUS-812
> URL: https://issues.apache.org/jira/browse/YETUS-812
> Project: Yetus
> Issue Type: Bug
> Reporter: Allen Wittenauer
> Priority: Major
>
> Fun bug:
> User makes a commit to a branch, sha 1. Jenkins picks it up, runs Yetus,
> everything is fine.
> Now user makes 2 commits to a branch and pushes to github: sha 2, sha 3
> jenkins checks out the branch at sha 3 on the same machine as the first run
> yetus (as expected) goes back to master
> yetus then checkouts branch at sha 1(!) but doesn't fast-forward the branch
> Two things of note:
> * this is a private repo
> * Yetus is running as apache/yetus:master docker container in such a way that
> git permissions aren't getting shared.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
