Release Upgrader

Merge ~waveform/ubuntu-release-upgrader:lp2065051-oracular into ubuntu-release-upgrader:ubuntu/main

  1. Git
  2. lp:~waveform/ubuntu-release-upgrader
  3. lp2065051-oracular
  4. Merge into ubuntu/main
Proposed by Dave Jones
Status: Merged
Merge reported by: Nick Rosbrook
Merged at revision: 5d8e7f4df956ae107cba343d5ebdeb638a7a2819
Proposed branch: ~waveform/ubuntu-release-upgrader:lp2065051-oracular
Merge into: ubuntu-release-upgrader:ubuntu/main
Diff against target: 261 lines (+179/-28)
3 files modified
DistUpgrade/DistUpgradeQuirks.py (+93/-28)
debian/changelog (+7/-0)
tests/test_quirks.py (+79/-0)
Reviewer Review Type Date Requested Status
Nick Rosbrook Approve
Review via email: mp+465724@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Nick Rosbrook (enr0n) wrote :

Looks good except that the test you added fails, but it looks trivial to fix. Note that I modified it locally to get the diff:

======================================================================
FAIL: test_add_kms_overlay_with_changes (test_quirks.TestQuirks.test_add_kms_overlay_with_changes)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/nr/ubuntu/code/ubuntu-release-upgrader/tests/test_quirks.py", line 603, in test_add_kms_overlay_with_changes
    self.assertEqual(f.read(), expected_config_txt)
AssertionError: 'arm_[55 chars]nel\n\ndtoverlay=vc4-kms-v3d\ndisable_fw_kms_s[122 chars]=2\n' != 'arm_[55 chars]nel\n# added by do-release-upgrade (LP: #20650[166 chars]=2\n'
  arm_64bit=1
  kernel=vmlinuz
  initramfs initrd.img followkernel
-
+ # added by do-release-upgrade (LP: #2065051)
  dtoverlay=vc4-kms-v3d
  disable_fw_kms_setup=1

  [pi3+]
  dtoverlay=vc4-kms-v3d,cma-128

  [pi02]
  dtoverlay=vc4-kms-v3d,cma-128

  [all]
  [pi4]
  max_framebuffers=2

----------------------------------------------------------------------

review: Needs Fixing
Revision history for this message
Dave Jones (waveform) wrote :

Urgh -- I ran the autopkgtest locally, but only fixed the noble branch and forgot the oracular one. Anyway, just force-pushed the branch to fix it.

Revision history for this message
Nick Rosbrook (enr0n) :
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