Merge ~racb/git-ubuntu:staging-branches into git-ubuntu:main

PASSED: Continuous integration, rev:f25d6fc9b4316c06d3ada43633a32ba87cce2326
https://jenkins.canonical.com/server-team/job/git-ubuntu-ci/40/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/git-ubuntu-ci/40//rebuild

I'm going over the spec and this branch.

Ok, got through the main update_staging_branches(). Overview:
- this function is called after devel (tip) was already updated via update_devel_branches(). If that fails, try/except around _main_with_repo() catches it, and just closes the repo and exits.
- if there is no tip, don't create the staging branch
- only stable series, as defined by LP ("supported")
- if there is no staging ref, create it pointing at tip
- if there is a staging ref, and it points to tip currently, skip (nothing to do)
- if there is a staging ref, and it can be fast-forwarded to tip, do it. If not, log the fact, and continue

Tomorrow morning I'll look at the tests

In the jenkins run, we see:
gitubuntu/importer_test.py ............................................. [ 46%]
....xx.................................................................. [ 61%]
...

And at the end:
gitubuntu/importer_test.py 411 2 99%

That's two "misses", what does that mean? This is in the test file this MP is adding tests to.

On Wed, Oct 11, 2023 at 12:51:32PM -0000, Andreas Hasenack wrote:
> That's two "misses", what does that mean? This is in the test file this MP is adding tests to.

These are xfails - we have tests for some applied import related
behaviour that haven't yet been fixed (I've not focused on applied
importer behaviour yet). These tests are marked with @pytest.mark.xfail.

Ok, I have nothing further to add. The test seem to cover what is being added, and the changes match the spec. +1

Thank you!