canonical-ci-engineering team mailing list archive
-
canonical-ci-engineering team
-
Mailing list archive
-
Message #01156
Re: auto-merging in our unity-scopes-api devel branch stopped working?
Hi Francis,
thanks for figuring this out! We were sitting there mystified as to why it wasn't picked up.
This situation is not common. It came about mainly because the gcc 5 transition caused a fair bit of disruption as we were trying to find a process that allows us to continue dual landings.
So, I don't think there is any need to change anything in CI for this.
Thanks again for your help!
Cheers,
Michi.
On 9 Sep 2015, at 4:37 , Francis Ginther <francis.ginther@xxxxxxxxxxxxx> wrote:
> Pawel,
>
> I dug around on this and found that jenkins skipped [0] this MP [1] because it couldn't find an approved MP for the prerequisite branch [2]. It looks like [2] had been merged some time ago, but [1] and [2] have different target branches, lp:unity-scopes-api/devel vs lp:unity-scopes-api. This difference in target branches app caused the ci tools to skip this branch for autolanding. I don't recall having seen this scenario before, is it common? My suggestion for dealing with this in the near term is to resubmit the MP and remove the prerequisite if it has already been merged and is blocking autolanding.
>
> [0] - http://s-jenkins.ubuntu-ci:8080/job/trigger-autolanding-on-stacks/80263/artifact/ci/dev-unity8.cfg.polling.log/*view*/
> [1] - https://code.launchpad.net/~michihenning/unity-scopes-api/single-tree/+merge/268433
> [2] - https://code.launchpad.net/~unity-api-team/unity-scopes-api/gcc-5-soname
>
> Francis
>
> On Mon, Sep 7, 2015 at 10:00 AM, Pawel Stolowski <pawel.stolowski@xxxxxxxxxxxxx> wrote:
> Hi Francis,
>
> Can you help with that? Note, I've just merged manually for the time being.
>
> Cheers,
> Pawel
>
>
> On 07.09.2015 12:43, Pawel Stolowski wrote:
> Hello,
>
> We have noticed that auto-landing of MPs against our devel branch of unity-scopes-api project stopped working, see:
> https://code.launchpad.net/~michihenning/unity-scopes-api/single-tree/+merge/268433
>
> Can somebody check what happened and enable it back if needed?
>
> Thank you,
> Pawel Stolowski
>
>
>
>
> --
> Francis Ginther
> Canonical - Ubuntu Engineering - Continuous Integration Team
References