1448 failed to apply on top of branch "stable/2023.2":
Applying: Bump to OVN 24.03 LTS
Applying: Trigger full rebuild
Using index info to reconstruct a base tree...
M Dockerfile
M images/barbican/Dockerfile
M images/cinder/Dockerfile
M images/cluster-api-provider-openstack/Dockerfile
M images/designate/Dockerfile
M images/glance/Dockerfile
M images/heat/Dockerfile
M images/horizon/Dockerfile
M images/ironic/Dockerfile
M images/keepalived/Dockerfile
M images/keystone/Dockerfile
M images/kubernetes-entrypoint/Dockerfile
M images/libvirtd/Dockerfile
M images/magnum/Dockerfile
M images/manila/Dockerfile
M images/netoffload/Dockerfile
M images/neutron/Dockerfile
M images/nova-ssh/Dockerfile
M images/nova/Dockerfile
M images/octavia/Dockerfile
M images/openstack-runtime/Dockerfile
M images/openstack-venv-builder/Dockerfile
M images/openvswitch/Dockerfile
M images/ovn/Dockerfile
M images/placement/Dockerfile
M images/python-base/Dockerfile
M images/python-openstackclient/Dockerfile
M images/staffeln/Dockerfile
M images/tempest/Dockerfile
M images/ubuntu-cloud-archive/Dockerfile
M images/ubuntu/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging images/ubuntu/Dockerfile
CONFLICT (content): Merge conflict in images/ubuntu/Dockerfile
Auto-merging images/ubuntu-cloud-archive/Dockerfile
CONFLICT (content): Merge conflict in images/ubuntu-cloud-archive/Dockerfile
Auto-merging images/tempest/Dockerfile
CONFLICT (content): Merge conflict in images/tempest/Dockerfile
Auto-merging images/staffeln/Dockerfile
CONFLICT (content): Merge conflict in images/staffeln/Dockerfile
Auto-merging images/python-openstackclient/Dockerfile
CONFLICT (content): Merge conflict in images/python-openstackclient/Dockerfile
Auto-merging images/python-base/Dockerfile
CONFLICT (content): Merge conflict in images/python-base/Dockerfile
Auto-merging images/placement/Dockerfile
CONFLICT (content): Merge conflict in images/placement/Dockerfile
Auto-merging images/ovn/Dockerfile
CONFLICT (content): Merge conflict in images/ovn/Dockerfile
Auto-merging images/openvswitch/Dockerfile
CONFLICT (content): Merge conflict in images/openvswitch/Dockerfile
Auto-merging images/openstack-venv-builder/Dockerfile
CONFLICT (content): Merge conflict in images/openstack-venv-builder/Dockerfile
Auto-merging images/openstack-runtime/Dockerfile
CONFLICT (content): Merge conflict in images/openstack-runtime/Dockerfile
Auto-merging images/octavia/Dockerfile
CONFLICT (content): Merge conflict in images/octavia/Dockerfile
Auto-merging images/nova/Dockerfile
CONFLICT (content): Merge conflict in images/nova/Dockerfile
Auto-merging images/nova-ssh/Dockerfile
CONFLICT (content): Merge conflict in images/nova-ssh/Dockerfile
Auto-merging images/neutron/Dockerfile
CONFLICT (content): Merge conflict in images/neutron/Dockerfile
Auto-merging images/netoffload/Dockerfile
CONFLICT (content): Merge conflict in images/netoffload/Dockerfile
Auto-merging images/manila/Dockerfile
CONFLICT (content): Merge conflict in images/manila/Dockerfile
Auto-merging images/magnum/Dockerfile
CONFLICT (content): Merge conflict in images/magnum/Dockerfile
Auto-merging images/libvirtd/Dockerfile
CONFLICT (content): Merge conflict in images/libvirtd/Dockerfile
Auto-merging images/kubernetes-entrypoint/Dockerfile
CONFLICT (content): Merge conflict in images/kubernetes-entrypoint/Dockerfile
Auto-merging images/keystone/Dockerfile
CONFLICT (content): Merge conflict in images/keystone/Dockerfile
Auto-merging images/keepalived/Dockerfile
CONFLICT (content): Merge conflict in images/keepalived/Dockerfile
Auto-merging images/ironic/Dockerfile
CONFLICT (content): Merge conflict in images/ironic/Dockerfile
Auto-merging images/horizon/Dockerfile
CONFLICT (content): Merge conflict in images/horizon/Dockerfile
Auto-merging images/heat/Dockerfile
CONFLICT (content): Merge conflict in images/heat/Dockerfile
Auto-merging images/glance/Dockerfile
CONFLICT (content): Merge conflict in images/glance/Dockerfile
Auto-merging images/designate/Dockerfile
CONFLICT (content): Merge conflict in images/designate/Dockerfile
Auto-merging images/cluster-api-provider-openstack/Dockerfile
CONFLICT (content): Merge conflict in images/cluster-api-provider-openstack/Dockerfile
Auto-merging images/cinder/Dockerfile
CONFLICT (content): Merge conflict in images/cinder/Dockerfile
Auto-merging images/barbican/Dockerfile
CONFLICT (content): Merge conflict in images/barbican/Dockerfile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Trigger full rebuild
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Manual cherrypick required.
1448 failed to apply on top of branch "stable/2023.2":