Merge ~ubuntu-release/autopkgtest/+git/development:oom-killer-revert into ~ubuntu-release/autopkgtest/+git/development:master

Proposed by Brian Murray
Status: Merged
Merged at revision: fc4b8b0043b982dd61701d1a4f17ad1e723cf8c7
Proposed branch: ~ubuntu-release/autopkgtest/+git/development:oom-killer-revert
Merge into: ~ubuntu-release/autopkgtest/+git/development:master
Diff against target: 15 lines (+1/-4)
1 file modified
lib/adt_testbed.py (+1/-4)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Paride Legovini Pending
Review via email: mp+438718@code.launchpad.net

Description of the change

Revert 842ca0f4bd78a6b0a7c1b484f7da242581651804 as systemd version 252.5-2ubuntu1 is now in the release pocket for Lunar so we shouldn't see its oom-killer killing all the processes in the testbed now.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/adt_testbed.py b/lib/adt_testbed.py
2index efaa927..bf08534 100644
3--- a/lib/adt_testbed.py
4+++ b/lib/adt_testbed.py
5@@ -585,10 +585,7 @@ class Testbed:
6
7 adtlog.debug('testbed command exited with code %i' % proc.returncode)
8
9- # systemd's oom-killer is killing all the processes in the testbed
10- # resulting in a 255 returncode - it'll be fixed in systemd RSN
11- # if proc.returncode in (254, 255):
12- if proc.returncode == 254:
13+ if proc.returncode in (254, 255):
14 self.command('auxverb_debug_fail')
15 self.bomb('testbed auxverb failed with exit code %i, argv: %r\nstdout: %s\nstderr: %s' % (proc.returncode, argv, out, err))
16

Subscribers

People subscribed via source and target branches