Open Stack

On 1/20/2017 9:20 AM, Jeremy Stanley wrote:
>
> Do you have example logs for those failures so we can compare them
> to the timeline for the fix landing? When a change enters a Zuul
> pipeline, it and its open parent changes are unconditionally merged
> to the current branch tip and then jobs are run against that state
> (and if the changes are unable to be merged to the branch tip
> without conflict, Zuul immediately reports back with a merge failure
> rather than running any jobs).
>

Yeah, this is the failure in the gate before I rebased it [1].

This is the change that was needed for the rebase [2].

Looking at when [1] failed and [2] merged, it looks like it [2] merged 
an hour later, so yeah, I guess I thought the other was already merged 
when I rebased [1].

So the world isn't ruined.

[1] 
http://logs.openstack.org/37/410737/5/gate/gate-nova-python35-db/1a828b8/console.html#_2017-01-19_23_23_36_271935
[2] https://review.openstack.org/#/c/421482/

-- 

Thanks,

Matt Riedemann