Ubuntu
ubuntu-advantage-tools package

Merge ~renanrodrigo/ubuntu/+source/ubuntu-advantage-tools:upload-27.14.4-lunar into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

  1. Git
  2. lp:~renanrodrigo/ubuntu/+source/ubuntu-advantage-tools
  3. upload-27.14.4-lunar
  4. Merge into ubuntu/devel
Proposed by Renan Rodrigo
Status: Merged
Merged at revision: e71be7b3dd2c55bb8ad9e9a99360b7dbc6aae5ab
Proposed branch: ~renanrodrigo/ubuntu/+source/ubuntu-advantage-tools:upload-27.14.4-lunar
Merge into: ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel
Diff against target: 78 lines (+13/-9)
5 files modified
debian/changelog (+8/-0)
lib/timer.py (+0/-6)
uaclient/entitlements/livepatch.py (+3/-1)
uaclient/tests/test_ua_timer.py (+1/-1)
uaclient/version.py (+1/-1)
Reviewer Review Type Date Requested Status
Athos Ribeiro (community) Approve
Canonical Server Core Reviewers Pending
Review via email: mp+440353@code.launchpad.net

Description of the change

This is the 27.14.4 release of ubuntu-advantage-tools.
This is a bugfix release, disabling a job that has potential to be harmful and making attachment possible again on non-amd64 by fixing livepatch.

To post a comment you must log in.
Revision history for this message
Renan Rodrigo (renanrodrigo) wrote :
Download full text (6.2 KiB)

autopkgtest links

* Triggers:
  - Source ubuntu-advantage-tools/27.14.4~16.04~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.4~16.04~rc1&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.4~16.04~rc1&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.4~16.04~rc1&ppa=ua-client%2Fstaging
    + i386: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=i386&trigger=ubuntu-advantage-tools%2F27.14.4~16.04~rc1&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.4~16.04~rc1&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.4~16.04~rc1&ppa=ua-client%2Fstaging

- Source ubuntu-advantage-tools/27.14.4~18.04~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.4~18.04~rc1&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.4~18.04~rc1&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.4~18.04~rc1&ppa=ua-client%2Fstaging
    + i386: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=i386&trigger=ubuntu-advantage-tools%2F27.14.4~18.04~rc1&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.4~18.04~rc1&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.4~18.04~rc1&ppa=ua-client%2Fstaging

- Source ubuntu-advantage-tools/27.14.4~20.04~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.4~20.04~rc1&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.4~20.04~rc1&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.4~20.04~rc1&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.4~20.0...

Read more...

Revision history for this message
Renan Rodrigo (renanrodrigo) wrote :

- ubuntu-advantage-tools/27.14.4~16.04~rc1
    + ✅ ubuntu-advantage-tools on xenial for amd64 @ 05.04.23 01:55:04
    + ✅ ubuntu-advantage-tools on xenial for arm64 @ 05.04.23 01:55:48
    + ✅ ubuntu-advantage-tools on xenial for armhf @ 05.04.23 01:54:01
    + ✅ ubuntu-advantage-tools on xenial for i386 @ 05.04.23 01:55:18
    + ✅ ubuntu-advantage-tools on xenial for ppc64el @ 05.04.23 01:53:29
    + ✅ ubuntu-advantage-tools on xenial for s390x @ 05.04.23 01:54:05

- ubuntu-advantage-tools/27.14.4~18.04~rc1
    + ✅ ubuntu-advantage-tools on bionic for amd64 @ 05.04.23 01:55:22
    + ✅ ubuntu-advantage-tools on bionic for arm64 @ 05.04.23 01:55:28
    + ✅ ubuntu-advantage-tools on bionic for armhf @ 05.04.23 01:54:25
    + ✅ ubuntu-advantage-tools on bionic for i386 @ 05.04.23 01:59:22
    + ✅ ubuntu-advantage-tools on bionic for ppc64el @ 05.04.23 01:55:47
    + ✅ ubuntu-advantage-tools on bionic for s390x @ 05.04.23 02:44:19

- ubuntu-advantage-tools/27.14.4~20.04~rc1
    + ✅ ubuntu-advantage-tools on focal for amd64 @ 05.04.23 02:08:11
    + ✅ ubuntu-advantage-tools on focal for arm64 @ 05.04.23 01:59:11
    + ✅ ubuntu-advantage-tools on focal for armhf @ 05.04.23 01:54:40
    + ✅ ubuntu-advantage-tools on focal for ppc64el @ 05.04.23 01:54:40
    + ✅ ubuntu-advantage-tools on focal for s390x @ 05.04.23 03:08:35

- ubuntu-advantage-tools/27.14.4~22.04~rc1
    + ✅ ubuntu-advantage-tools on jammy for amd64 @ 05.04.23 01:59:22
    + ✅ ubuntu-advantage-tools on jammy for arm64 @ 05.04.23 01:57:22
    + ✅ ubuntu-advantage-tools on jammy for armhf @ 05.04.23 01:54:58
    + ✅ ubuntu-advantage-tools on jammy for ppc64el @ 05.04.23 01:54:04
    + ✅ ubuntu-advantage-tools on jammy for s390x @ 05.04.23 01:54:01

- ubuntu-advantage-tools/27.14.4~22.10~rc1
    + ✅ ubuntu-advantage-tools on kinetic for amd64 @ 05.04.23 01:58:07
    + ✅ ubuntu-advantage-tools on kinetic for arm64 @ 05.04.23 02:28:11
    + ✅ ubuntu-advantage-tools on kinetic for armhf @ 05.04.23 01:54:44
    + ✅ ubuntu-advantage-tools on kinetic for ppc64el @ 05.04.23 01:54:34
    + ✅ ubuntu-advantage-tools on kinetic for s390x @ 05.04.23 01:54:16

- ubuntu-advantage-tools/27.14.4~rc1
    + ✅ ubuntu-advantage-tools on lunar for amd64 @ 05.04.23 02:11:59
    + ✅ ubuntu-advantage-tools on lunar for arm64 @ 05.04.23 01:57:08
    + ✅ ubuntu-advantage-tools on lunar for armhf @ 05.04.23 01:55:44
    + ✅ ubuntu-advantage-tools on lunar for ppc64el @ 05.04.23 01:54:25
    + ✅ ubuntu-advantage-tools on lunar for s390x @ 05.04.23 02:17:20

Revision history for this message
Athos Ribeiro (athos-ribeiro) :
review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Tanks, Renan!

LGTM

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Uploaded.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index c6ae74e..69290bb 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+ubuntu-advantage-tools (27.14.4) lunar; urgency=medium
7+
8+ * timer: disable update_contract_info job (LP: #2015302)
9+ * livepatch: prevent livepatch from auto-enabling and subsequently failing
10+ on non-amd64 systems (LP: #2015241)
11+
12+ -- Renan Rodrigo <renanrodrigo@canonical.com> Tue, 04 Apr 2023 17:56:07 -0300
13+
14 ubuntu-advantage-tools (27.14.3) lunar; urgency=medium
15
16 * livepatch: prevent livepatch from auto-enabling and subsequently failing
17diff --git a/lib/timer.py b/lib/timer.py
18index 0516e9a..5cf1958 100644
19--- a/lib/timer.py
20+++ b/lib/timer.py
21@@ -174,12 +174,6 @@ def run_jobs(cfg: UAConfig, current_time: datetime):
22 jobs_status_obj.update_messaging = run_job(
23 cfg, update_message_job, current_time, jobs_status_obj.update_messaging
24 )
25- jobs_status_obj.update_contract_info = run_job(
26- cfg,
27- update_contract_info_job,
28- current_time,
29- jobs_status_obj.update_contract_info,
30- )
31 timer_jobs_state_file.write(jobs_status_obj)
32
33
34diff --git a/uaclient/entitlements/livepatch.py b/uaclient/entitlements/livepatch.py
35index e382d52..6f00f03 100644
36--- a/uaclient/entitlements/livepatch.py
37+++ b/uaclient/entitlements/livepatch.py
38@@ -32,11 +32,13 @@ class LivepatchEntitlement(UAEntitlement):
39 name = "livepatch"
40 title = "Livepatch"
41 description = "Canonical Livepatch service"
42- affordance_check_arch = False
43 affordance_check_kernel_min_version = False
44 affordance_check_kernel_flavor = False
45 # we do want to check series because livepatch errors on non-lts releases
46 affordance_check_series = True
47+ # we still need to check arch because the livepatch-client is not built
48+ # for all arches
49+ affordance_check_arch = True
50
51 @property
52 def incompatible_services(self) -> Tuple[IncompatibleService, ...]:
53diff --git a/uaclient/tests/test_ua_timer.py b/uaclient/tests/test_ua_timer.py
54index 9fa02e9..3bfb5bb 100644
55--- a/uaclient/tests/test_ua_timer.py
56+++ b/uaclient/tests/test_ua_timer.py
57@@ -183,7 +183,7 @@ class TestTimer:
58 assert [
59 mock.call(m_jobs_state())
60 ] == fake_file.write.call_args_list
61- assert 3 == m_run_job.call_count
62+ assert 2 == m_run_job.call_count
63 else:
64 assert [] == fake_file.write.call_args_list
65 assert 0 == m_run_job.call_count
66diff --git a/uaclient/version.py b/uaclient/version.py
67index 7fabad9..d15e986 100644
68--- a/uaclient/version.py
69+++ b/uaclient/version.py
70@@ -15,7 +15,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH
71 from uaclient.exceptions import ProcessExecutionError
72 from uaclient.system import subp
73
74-__VERSION__ = "27.14.3"
75+__VERSION__ = "27.14.4"
76 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
77
78 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"

Subscribers

People subscribed via source and target branches

to status/vote changes: