Merge ~ahasenack/ubuntu/+source/base-files:bionic-motd-news-per-cloud into ubuntu/+source/base-files:ubuntu/bionic-devel
Proposed by
Andreas Hasenack
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andreas Hasenack | ||||
Approved revision: | e40500be779d94fca56523bdbe9b1678c952bf30 | ||||
Merged at revision: | e40500be779d94fca56523bdbe9b1678c952bf30 | ||||
Proposed branch: | ~ahasenack/ubuntu/+source/base-files:bionic-motd-news-per-cloud | ||||
Merge into: | ubuntu/+source/base-files:ubuntu/bionic-devel | ||||
Diff against target: |
62 lines (+22/-3) 2 files modified
debian/changelog (+7/-0) update-motd.d/50-motd-news (+15/-3) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Canonical Server Core Reviewers | Pending | ||
Review via email: mp+373413@code.launchpad.net |
Description of the change
Bring in the per-cloud motd support, which adds the cloud_id/<name> string to the user-agent. This is a direct cherry-pick from the change that is in eoan already, with the exception that in eoan the script is located in the motd/ directory, and not update-motd/, in the source tree.
Testing instructions are in the SRU bug #1840946
Test PPA is at https:/
sudo add-apt-repository -y ppa:ahasenack/
To post a comment you must log in.
Completed review of the motd changes, including running the test cases in a bionic lxd container. One suggested technical change for numerical comparisons (ok by me to fix with the upload), but otherwise rest LGTM. Tests worked as expected on bionic.
- [√] changelog entry correct, targeted to correct codename patches/ series? motd.d/ 50-motd- news --force motd.d/ 50-motd- news --force 2>&1| grep -E "curl .*cloud_id/"
- [√] version number correct
- [√] update-maintainer has been run
- [~] patches match what was proposed upstream
- [~] patches correctly included in debian/
- [~] patches have correct DEP3 metadata
- [~] autopkgtest passes
- [√] test case a: confirm Kata Containers motd
sudo sh /etc/update-
- [√] test case b: confirm cloud_id set in user-agent to "cloud_id/lxd"
sudo sh -x /etc/update-
- [√] test case c: list timers to confirm motd-news is active
... 10h left Tue 2019-10-01 17:15:33 UTC 1h 20min ago motd-news.timer motd-news.service