Merge ~chad.smith/ubuntu/+source/update-notifier:update-notifier-esm-support-hirsute into ubuntu/+source/update-notifier:ubuntu/hirsute-proposed

Proposed by Chad Smith
Status: Approved
Approved by: Bryce Harrington
Approved revision: 73a133fef94e01ab004c04d1f284a930b1163177
Proposed branch: ~chad.smith/ubuntu/+source/update-notifier:update-notifier-esm-support-hirsute
Merge into: ubuntu/+source/update-notifier:ubuntu/hirsute-proposed
Diff against target: 885 lines (+521/-143)
4 files modified
data/apt_check.py (+186/-83)
debian/changelog (+17/-0)
debian/control (+2/-0)
tests/test_motd.py (+316/-60)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Lucas Albuquerque Medeiros de Moura Pending
Brian Murray Pending
Review via email: mp+401662@code.staging.launchpad.net

Description of the change

Currently, the apt-check script is configured to only handle package count for ESM Infra. We are now updating the logic to also handle ESM Apps packages as well.

Furthermore, we are also updating the messaging that is created in apt-check. We are advertising ESM Apps if the service is disabled and only messaging about ESM Infra if the distro is already on ESM mode.

Finally, this PR also fixes LP #1883315, since we now check to see if the system has esm-infra or esm-apps before performing a package count for package with esm origins

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

I'd reviewed the focal/bionic/xenial versions of this branch previously. Lucas had added some code docs for some of the new functions that should be included here as well, so they're preserved in the devel tree going forward.

I'd also appreciate a summary of any other known differences between this MP and the focal/bionic/xenial one. Offhand this looks the same as that but I didn't do a strict comparison.

review: Needs Fixing
Revision history for this message
Brian Murray (brian-murray) wrote :

I uploaded update-notifier to the hirsute queue after I merged Lucas's changes to the devel branch.

https://launchpadlibrarian.net/534437086/update-notifier_3.192.40_3.192.41.diff.gz

In the event that some code docs were added I should reject the old hirsute upload and we should get a new one so the code is consistent across releases.

Revision history for this message
Chad Smith (chad.smith) wrote :

Thank you so much Bryce and Brian for the quick reviews here. So does that
mean we should add another upload to devel then?
If so, I'll sort with Lucas Monday morning about what we need to do there
to ensure consistency

Thanks again guys,
Chad

On Fri, Apr 23, 2021 at 3:20 PM Brian Murray <email address hidden> wrote:

> I uploaded update-notifier to the hirsute queue after I merged Lucas's
> changes to the devel branch.
>
>
> https://launchpadlibrarian.net/534437086/update-notifier_3.192.40_3.192.41.diff.gz
>
> In the event that some code docs were added I should reject the old
> hirsute upload and we should get a new one so the code is consistent across
> releases.
> --
>
> https://code.launchpad.net/~chad.smith/ubuntu/+source/update-notifier/+git/update-notifier/+merge/401662
> You are the owner of
> ~chad.smith/ubuntu/+source/update-notifier:update-notifier-esm-support-hirsute.
>

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

Make sure to include the code docs that lamoura added for the other MPs, so those changes are preserved going forward:

https://code.launchpad.net/~lamoura/ubuntu/+source/update-notifier/+git/update-notifier/+merge/401657

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

Since the xenial sru is under a deadline to get uploaded, and since the code docs aren't a necessary part of the fix, I went ahead and uploaded this branch as is, but do please incorporate them in your branch so they'll be there for the next update.

triage-hirsute+21.04:~/pkg/UpdateNotifier/review-mp401662/update-notifier-gu$ git ubuntu tag -f --upload
Updated tag 'upload/3.192.40.1' (was d633f7f)
triage-hirsute+21.04:~/pkg/UpdateNotifier/review-mp401662/update-notifier-gu$ git push pkg upload/3.192.40.1
Enumerating objects: 39, done.
Counting objects: 100% (39/39), done.
Delta compression using up to 12 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (31/31), 8.71 KiB | 1.45 MiB/s, done.
Total 31 (delta 24), reused 16 (delta 12), pack-reused 0
To ssh://git.launchpad.net/ubuntu/+source/update-notifier
 * [new tag] upload/3.192.40.1 -> upload/3.192.40.1
triage-hirsute+21.04:~/pkg/UpdateNotifier/review-mp401662$ dput ubuntu update-notifier_3.192.40.1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: /home/bryce/pkg/UpdateNotifier/review-mp401662/update-notifier_3.192.40.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/UpdateNotifier/review-mp401662/update-notifier_3.192.40.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading update-notifier_3.192.40.1.dsc: done.
  Uploading update-notifier_3.192.40.1.tar.xz: done.
  Uploading update-notifier_3.192.40.1_source.buildinfo: done.
  Uploading update-notifier_3.192.40.1_source.changes: done.
Successfully uploaded packages.

review: Approve

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