Merge ~andreserl/maas:lp1767137_2.3_xenial_default into maas:2.3

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 5069ab7bfe4e9d70ba2e80ba736c327a0c081bc3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:lp1767137_2.3_xenial_default
Merge into: maas:2.3
Diff against target: 37 lines (+12/-3)
2 files modified
src/provisioningserver/drivers/osystem/tests/test_ubuntu.py (+5/-1)
src/provisioningserver/drivers/osystem/ubuntu.py (+7/-2)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Blake Rouse (community) Approve
Andres Rodriguez (community) Approve
Review via email: mp+344489@code.launchpad.net

Commit message

LP: #1767137 - Harcode Xenial as the default LTS for 2.3

To post a comment you must log in.
Revision history for this message
Jason Hobbs (jason-hobbs) wrote :

Won't this break again in 2 years, even though 2.3 and xenial will still be supported?

Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1767137_2.3_xenial_default lp:~andreserl/maas/+git/maas into -b 2.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2625/console
COMMIT: 689144e8b225d480d6199b3712bed576d9b8682e

review: Needs Fixing
5069ab7... by Andres Rodriguez

Fix test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py b/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py
2index 1523da7..fdf57e2 100644
3--- a/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py
4+++ b/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py
5@@ -19,7 +19,11 @@ from provisioningserver.drivers.osystem.ubuntu import UbuntuOS
6 class TestUbuntuOS(MAASTestCase):
7
8 def get_lts_release(self):
9- return UbuntuDistroInfo().lts()
10+ # XXX roaksoax 2017-04-26 LP: #1767137
11+ # 2.3 uses Xenial as the default release. Hardcode this to
12+ # xenial to ensure it doesn't break CI environments or new
13+ # installs that expect xenial.
14+ return "xenial"
15
16 def get_release_title(self, release):
17 info = UbuntuDistroInfo()
18diff --git a/src/provisioningserver/drivers/osystem/ubuntu.py b/src/provisioningserver/drivers/osystem/ubuntu.py
19index 2db060e..8683bf5 100644
20--- a/src/provisioningserver/drivers/osystem/ubuntu.py
21+++ b/src/provisioningserver/drivers/osystem/ubuntu.py
22@@ -41,8 +41,13 @@ class UbuntuOS(OperatingSystem):
23 return row is not None
24
25 def get_lts_release(self):
26- """Return the latest Ubuntu LTS release."""
27- return self.ubuntu_distro_info.lts()
28+ """Return the default Ubuntu LTS release for this MAAS release."""
29+ # XXX roaksoax 2017-04-26 LP: #1767137 - This function used to
30+ # rely on distro info to get the default LTS. However, since it now
31+ # returns a release that's not 'xenial', this breaks new installs
32+ # or CI environments. As such, hard code the LTS release to use as
33+ # a default here.
34+ return "xenial"
35
36 def get_default_release(self):
37 """Gets the default release to use when a release is not

Subscribers

People subscribed via source and target branches