Merge ~vpa1977/ubuntu/+source/munin:2054628 into ubuntu/+source/munin:debian/sid
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | git-ubuntu bot | ||||
Merged at revision: | a5744cf037fbf3199092f748a1294f1667cfce36 | ||||
Proposed branch: | ~vpa1977/ubuntu/+source/munin:2054628 | ||||
Merge into: | ubuntu/+source/munin:debian/sid | ||||
Diff against target: |
468 lines (+264/-19) 8 files modified
debian/Makefile.config (+4/-0) debian/changelog (+193/-0) debian/control (+2/-1) debian/patches/munin-node-configure-doc-fix.patch (+42/-0) debian/patches/series (+1/-0) debian/tests/control (+17/-17) debian/tests/munin-node/02.plugins.t (+5/-0) dev/null (+0/-1) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zixing Liu (community) | Approve | ||
Canonical Server Reporter | Pending | ||
git-ubuntu import | Pending | ||
Review via email: mp+460995@code.launchpad.net |
Description of the change
Please review the munin merge.
Note: the changelog for 2.0.74-2ubuntu1 states that sysv tests are dropped, but the delta is still present and tests are not disabled in Debian. I have left this change.
The merge was a clean rebase of Ubuntu delta on new Debian version. I have added a fix for the plugin list test that was not expecting extra plugins.
PPA: ppa:vpa1977/
Changes:
* Merge with Debian unstable (LP: #2054628). Remaining changes:
- d/p/munin-
argument exitonerror and update some snmp arguments to match
their correct naming.
- Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu
- Add missing test dependency on net-tools for netstat plugin.
- d/Makefile.config: Use java_compat_level provided by java-common
to set --release level.
* New changes:
- d/t/munin-
the plugin list test.
Testing:
- install/remove, install-
Note: piuparts for some reason attempts to remove
bsdutils
libblkid1:
libuuid1:amd64
util-linux
libmount1:
libsmartco
and fails.
- autopkgtest
+ ✅ munin on noble for amd64 @ 22.02.24 22:38:39 Log️ 🗒️
+ ✅ munin on noble for arm64 @ 22.02.24 22:47:06 Log️ 🗒️
+ ✅ munin on noble for armhf @ 22.02.24 22:40:44 Log️ 🗒️
+ ❌ munin on noble for i386 @ 22.02.24 22:37:02 Log️ 🗒️[3]
• master-cron-systemd FAIL 🟥
• master-cgi-systemd FAIL 🟥
• node-systemd FAIL 🟥
• command1 FAIL 🟥
+ ✅ munin on noble for ppc64el @ 22.02.24 22:30:05 Log️ 🗒️
+ ✅ munin on noble for s390x @ 22.02.24 22:42:02 Log️ 🗒️
The test fails on i386 due to package being uninstallable[4]
[1] https:/
[2] https:/
[3] https:/
[4] https:/
The merge looks good to me.
Regarding autopkgtest, I have queued an all-proposed test to see if it will co-install with other Java packages currently residing in the -proposed pocket. The results will show in https:/ /autopkgtest. ubuntu. com/results/ autopkgtest- noble-vpa1977- plusone/ ?format= plain after they finish running.