apertis-pkg-merge-updates: fast-forward the main debian branch after a Debian release point

Updates available in -security and -proposed-updates fall into the main Debian repository after a Debian release point. In case an update has been imported from -security or -proposed-updates, our main Debian branch stays out of date. Consequently, the Dashboard wrongly complains about an available update from Debian.

In this scenario, the main Debian branch needs to be synchronized with the -security or -proposed-updates branch used previously.

https://phabricator.apertis.org/T8870

Signed-off-by: Dylan Aïssi dylan.aissi@collabora.com

changed the description

mentioned in merge request infrastructure/dashboard!110 (closed)

I tried not to change the logic of apertis-pkg-merge-updates, but I am not too much happy with the new call to should_update fetching again data from Madison.

requested review from @andrewsh

I think in any case we should probably @cache calls to Madison and other remote services that are not supposed to change their replies during the run.

approved this merge request

Feel free to sprinkle @cache all over if you feel like it, or merge directly.

added 1 commit

• e85c4973 - apertis-pkg-merge-updates: fast-forward the main debian branch after a Debian release point

Compare with previous version

resolved all threads

merged