Failed to sync stable/liberty for openstack projects because patch from package does not apply

[Dmitry Mescheryakov]

The CR https://review.fuel-infra.org/#/c/13033/ can not be merged because patch from package fails to apply automatically. See job https://packaging-ci.infra.mirantis.net/job/8.0-pkg-pipeline-ubuntu/2257/console

Here:

patching file requirements.txt
Hunk #1 FAILED at 15.
1 out of 1 hunk FAILED
dpkg-source: info: fuzz is not allowed when applying patches
dpkg-source: info: if patch 'no-version-for-python-tz.patch' is correctly applied by quilt, use 'quilt refresh' to update it
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/no-version-for-python-tz.patch/ --reject-file=- < python-oslo.serialization.orig.fd9NmV/debian/patches/no-version-for-python-tz.patch gave error exit status 1
E: Failed to package source directory /srv/source/python-oslo.serialization

[Thomas Goirand (thomas-goirand)]

Hi. There's nothing in the code review that makes it possible to see the patch. When I click on the patchset, it tells: "Trivial merge" with no more info. Where may I see the patch, so that I can attempt to understand?

[Dmitry Mescheryakov (dmitrymex)]

Hello Thomas, the reason is that the patch is a merge commit. You can do the following:
 * checkout the patch from gerrit
 * do 'git diff origin/openstack-ci/fuel-8.0/liberty..HEAD'

That will provide you with diff between current state of openstack-ci/fuel-8.0/liberty and the patch

[Artem Silenkov (asilenkov)]

We have to group "spec request" and "code request" before merge. Testing it right now.

[Artem Silenkov (asilenkov)]

ceilometer
murano
keystone
oslo.serialization

are also affected

[Artem Silenkov (asilenkov)]

oslo.serialization need manual investigation, requirements.rpm file is not clean for this patch.