Merge ~bryce/ubuntu/+source/dovecot:merge-v1e2.3.20adfsg1-1-mantic into ubuntu/+source/dovecot:debian/sid

Proposed by Bryce Harrington
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: 111c435dcd2cccdc9142537ec0c83c51878d2ee7
Proposed branch: ~bryce/ubuntu/+source/dovecot:merge-v1e2.3.20adfsg1-1-mantic
Merge into: ubuntu/+source/dovecot:debian/sid
Diff against target: 208 lines (+152/-2)
2 files modified
debian/changelog (+149/-0)
debian/control (+3/-2)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Sergio Durigan Junior (community) Approve
Canonical Server Pending
Canonical Server Core Reviewers Pending
Canonical Server Reporter Pending
Review via email: mp+448524@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

Bug: https://bugs.launchpad.net/ubuntu/+source/dovecot/+bug/2029440
PPA: https://launchpad.net/~bryce/+archive/ubuntu/dovecot-merge-v1e2.3.20adfsg1-1

There is just a single bit of delta left, the lua5.4 demote, which is poised to go away once the Lua 5.4 MIR is completed. I understand that's imminent so I expect this merge will actually be a sync, and this MP is mainly just for reviewing/approving sync-worthiness.

I've verified the package builds and the dep8 tests run fine. I did run into one error running the autopkgtests locally but isolated the cause to something particular to running the tests in that context, see LP: #2029440 for discussion on that, but it is a non-issue. The dep8 tests passed fine against the PPA, so no problems expected for the package transition, except i386 which is known and non-blocking.

  - dovecot/1:2.3.20+dfsg1-1ubuntu1~mantic1
    + ✅ dovecot on mantic for amd64 @ 04.08.23 02:33:42 Log️ 🗒️
    + ✅ dovecot on mantic for arm64 @ 04.08.23 03:14:27 Log️ 🗒️
    + ✅ dovecot on mantic for armhf @ 04.08.23 02:41:05 Log️ 🗒️
    + ❌ dovecot on mantic for i386 @ 04.08.23 02:33:35 Log️ 🗒️
      • 388s FAIL 🟥
      • 388s FAIL 🟥
      • 388s FAIL 🟥
      • 388s FAIL 🟥
      • 388s FAIL 🟥
    + ✅ dovecot on mantic for ppc64el @ 04.08.23 02:45:39 Log️ 🗒️
    + ✅ dovecot on mantic for s390x @ 04.08.23 02:35:19 Log️ 🗒️

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I can take a look at this one.

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Bryce.

Trivial merge indeed. The problem you faced while running the dep8 tests locally is indeed because the tests expect to be executed as root (there's a "needs-root" restriction in place for them). That's why I always resort to running the tests inside an lxd/qemu environment.

Anyway, the proposed merge LGTM. +1

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: bryce, sergiodj
Uploaders: bryce, sergiodj
MP auto-approved

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks Sergio,

Given this is approved but the lua mir seems to be still in flight, I'll upload this now to get the new version through transition, which should help make the post-mir sync trivial.

 signfile dsc ../dovecot_2.3.20+dfsg1-1ubuntu1.dsc A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_buildinfo ../dovecot_2.3.20+dfsg1-1ubuntu1.dsc ../dovecot_2.3.20+dfsg1-1ubuntu1_source.buildinfo
 signfile buildinfo ../dovecot_2.3.20+dfsg1-1ubuntu1_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc ../dovecot_2.3.20+dfsg1-1ubuntu1.dsc ../dovecot_2.3.20+dfsg1-1ubuntu1_source.changes
 fixup_changes buildinfo ../dovecot_2.3.20+dfsg1-1ubuntu1_source.buildinfo ../dovecot_2.3.20+dfsg1-1ubuntu1_source.changes
 signfile changes ../dovecot_2.3.20+dfsg1-1ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/dovecot
Vcs-Git-Commit: 111c435dcd2cccdc9142537ec0c83c51878d2ee7
Vcs-Git-Ref: refs/heads/merge-v1e2.3.20adfsg1-1-mantic
$ dput ubuntu ../dovecot_2.3.20+dfsg1-1ubuntu1_source.changes
gpg: ../dovecot_2.3.20+dfsg1-1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../dovecot_2.3.20+dfsg1-1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dovecot_2.3.20+dfsg1-1ubuntu1.dsc: done.
  Uploading dovecot_2.3.20+dfsg1.orig-pigeonhole.tar.gz: done.
  Uploading dovecot_2.3.20+dfsg1.orig.tar.gz: done.
  Uploading dovecot_2.3.20+dfsg1-1ubuntu1.debian.tar.xz: done.
  Uploading dovecot_2.3.20+dfsg1-1ubuntu1_source.buildinfo: done.
  Uploading dovecot_2.3.20+dfsg1-1ubuntu1_source.changes: done.
Successfully uploaded packages.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches