Ubuntu
ubuntu-advantage-tools package

Merge ~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools:upload-27.14.3-lunar into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

  1. Git
  2. lp:~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools
  3. upload-27.14.3-lunar
  4. Merge into ubuntu/devel
Proposed by Grant Orndorff
Status: Merged
Merged at revision: 98ff2b2fb2c22b73718c278764685b6e9aa254f7
Proposed branch: ~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools:upload-27.14.3-lunar
Merge into: ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel
Diff against target: 109 lines (+44/-3)
6 files modified
debian/changelog (+7/-0)
features/livepatch.feature (+31/-0)
tools/run-integration-tests.py (+1/-1)
tox.ini (+2/-0)
uaclient/entitlements/livepatch.py (+2/-1)
uaclient/version.py (+1/-1)
Reviewer Review Type Date Requested Status
Athos Ribeiro (community) Approve
Canonical Server Core Reviewers Pending
Canonical Server Reporter Pending
Review via email: mp+440172@code.launchpad.net

Description of the change

This is the 27.14.3 release of ubuntu-advantage-tools.
See #2013409 for more information.

Autopkgtest
* Triggers:
  - Source ubuntu-advantage-tools/27.14.3~16.04.1~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.3~16.04.1~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.3~16.04.1~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.3~16.04.1~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.3~16.04.1~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.3~16.04.1~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.3~16.04.1~rc1&ppa=ua-client%2Fstaging
  - Source ubuntu-advantage-tools/27.14.3~18.04.1~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.3~18.04.1~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.3~18.04.1~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.3~18.04.1~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.3~18.04.1~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.3~18.04.1~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.3~18.04.1~rc1&ppa=ua-client%2Fstaging
  - Source ubuntu-advantage-tools/27.14.3~20.04.1~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.3~20.04.1~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.3~20.04.1~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.3~20.04.1~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.3~20.04.1~rc1&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.3~20.04.1~rc1&ppa=ua-client%2Fstaging
    + riscv64: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=riscv64&trigger=ubuntu-advantage-tools%2F27.14.3~20.04.1~rc1&ppa=ua-client%2Fstaging
  - Source ubuntu-advantage-tools/27.14.3~22.04.1~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=jammy&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.3~22.04.1~rc1&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=jammy&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.3~22.04.1~rc1&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=jammy&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.3~22.04.1~rc1&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=jammy&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.3~22.04.1~rc1&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=jammy&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.3~22.04.1~rc1&ppa=ua-client%2Fstaging
    + riscv64: https://autopkgtest.ubuntu.com/request.cgi?release=jammy&package=ubuntu-advantage-tools&arch=riscv64&trigger=ubuntu-advantage-tools%2F27.14.3~22.04.1~rc1&ppa=ua-client%2Fstaging
  - Source ubuntu-advantage-tools/27.14.3~22.10.1~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=kinetic&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.3~22.10.1~rc1&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=kinetic&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.3~22.10.1~rc1&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=kinetic&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.3~22.10.1~rc1&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=kinetic&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.3~22.10.1~rc1&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=kinetic&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.3~22.10.1~rc1&ppa=ua-client%2Fstaging
    + riscv64: https://autopkgtest.ubuntu.com/request.cgi?release=kinetic&package=ubuntu-advantage-tools&arch=riscv64&trigger=ubuntu-advantage-tools%2F27.14.3~22.10.1~rc1&ppa=ua-client%2Fstaging
  - Source ubuntu-advantage-tools/27.14.3~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=lunar&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.3~rc1&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=lunar&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.3~rc1&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=lunar&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.3~rc1&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=lunar&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.3~rc1&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=lunar&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.3~rc1&ppa=ua-client%2Fstaging
    + riscv64: https://autopkgtest.ubuntu.com/request.cgi?release=lunar&package=ubuntu-advantage-tools&arch=riscv64&trigger=ubuntu-advantage-tools%2F27.14.3~rc1&ppa=ua-client%2Fstaging

To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) :
review: Approve
Revision history for this message
Grant Orndorff (orndorffgrant) wrote :

Autopkgtest results:
  - ubuntu-advantage-tools/27.14.3~rc1
    + ✅ ubuntu-advantage-tools on lunar for amd64 @ 31.03.23 19:35:47 Log 🗒
    + ✅ ubuntu-advantage-tools on lunar for arm64 @ 31.03.23 19:46:13 Log 🗒
    + ✅ ubuntu-advantage-tools on lunar for armhf @ 31.03.23 19:29:02 Log 🗒
    + ✅ ubuntu-advantage-tools on lunar for ppc64el @ 31.03.23 19:32:39 Log 🗒
    + ✅ ubuntu-advantage-tools on lunar for s390x @ 31.03.23 20:38:55 Log 🗒
  - ubuntu-advantage-tools/27.14.3~22.10.1~rc1
    + ✅ ubuntu-advantage-tools on kinetic for amd64 @ 31.03.23 19:52:29 Log 🗒
    + ✅ ubuntu-advantage-tools on kinetic for arm64 @ 31.03.23 20:06:47 Log 🗒
    + ✅ ubuntu-advantage-tools on kinetic for armhf @ 31.03.23 19:32:51 Log 🗒
    + ✅ ubuntu-advantage-tools on kinetic for ppc64el @ 31.03.23 19:34:53 Log 🗒
    + ✅ ubuntu-advantage-tools on kinetic for s390x @ 31.03.23 19:56:32 Log 🗒
  - ubuntu-advantage-tools/27.14.3~22.04.1~rc1
    + ✅ ubuntu-advantage-tools on jammy for amd64 @ 31.03.23 19:35:02 Log 🗒
    + ✅ ubuntu-advantage-tools on jammy for arm64 @ 31.03.23 20:08:40 Log 🗒
    + ✅ ubuntu-advantage-tools on jammy for armhf @ 31.03.23 19:28:33 Log 🗒
    + ✅ ubuntu-advantage-tools on jammy for ppc64el @ 31.03.23 19:30:21 Log 🗒
    + ✅ ubuntu-advantage-tools on jammy for s390x @ 31.03.23 19:30:11 Log 🗒
  - ubuntu-advantage-tools/27.14.3~20.04.1~rc1
    + ✅ ubuntu-advantage-tools on focal for amd64 @ 31.03.23 19:36:17 Log 🗒
    + ✅ ubuntu-advantage-tools on focal for arm64 @ 31.03.23 19:34:37 Log 🗒
    + ✅ ubuntu-advantage-tools on focal for armhf @ 31.03.23 19:32:58 Log 🗒
    + ✅ ubuntu-advantage-tools on focal for ppc64el @ 31.03.23 19:36:17 Log 🗒
    + ✅ ubuntu-advantage-tools on focal for s390x @ 31.03.23 19:40:50 Log 🗒
  - ubuntu-advantage-tools/27.14.3~18.04.1~rc1
    + ✅ ubuntu-advantage-tools on bionic for amd64 @ 31.03.23 19:43:22 Log 🗒
    + ✅ ubuntu-advantage-tools on bionic for arm64 @ 31.03.23 22:12:27 Log 🗒
    + ✅ ubuntu-advantage-tools on bionic for armhf @ 31.03.23 19:28:46 Log 🗒
    + ✅ ubuntu-advantage-tools on bionic for i386 @ 31.03.23 19:33:50 Log 🗒
    + ✅ ubuntu-advantage-tools on bionic for ppc64el @ 31.03.23 19:29:53 Log 🗒
    + ✅ ubuntu-advantage-tools on bionic for s390x @ 31.03.23 20:16:37 Log 🗒
  - ubuntu-advantage-tools/27.14.3~16.04.1~rc1
    + ✅ ubuntu-advantage-tools on xenial for amd64 @ 31.03.23 20:07:54 Log 🗒
    + ✅ ubuntu-advantage-tools on xenial for arm64 @ 31.03.23 19:33:39 Log 🗒
    + ✅ ubuntu-advantage-tools on xenial for armhf @ 31.03.23 19:29:28 Log 🗒
    + ✅ ubuntu-advantage-tools on xenial for i386 @ 31.03.23 19:38:26 Log 🗒
    + ✅ ubuntu-advantage-tools on xenial for ppc64el @ 31.03.23 19:26:52 Log 🗒
    + ✅ ubuntu-advantage-tools on xenial for s390x @ 31.03.23 20:41:15 Log 🗒

Revision history for this message
Grant Orndorff (orndorffgrant) wrote :

SRU branches:
https://code.launchpad.net/~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+ref/upload-27.14.3-kinetic
https://code.launchpad.net/~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+ref/upload-27.14.3-jammy
https://code.launchpad.net/~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+ref/upload-27.14.3-focal
https://code.launchpad.net/~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+ref/upload-27.14.3-bionic
https://code.launchpad.net/~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+ref/upload-27.14.3-xenial

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

Thank you :)

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 0ff4d28..c6ae74e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+ubuntu-advantage-tools (27.14.3) lunar; urgency=medium
7+
8+ * livepatch: prevent livepatch from auto-enabling and subsequently failing
9+ on interim releases (LP: #2013409)
10+
11+ -- Grant Orndorff <grant.orndorff@canonical.com> Fri, 31 Mar 2023 10:13:44 -0400
12+
13 ubuntu-advantage-tools (27.14.2~23.04.1) lunar; urgency=medium
14
15 * status:
16diff --git a/features/livepatch.feature b/features/livepatch.feature
17index b73dab7..31641b7 100644
18--- a/features/livepatch.feature
19+++ b/features/livepatch.feature
20@@ -70,3 +70,34 @@ Feature: Livepatch
21 Examples: ubuntu release
22 | release |
23 | focal |
24+
25+ @series.kinetic
26+ @series.lunar
27+ @uses.config.machine_type.lxd.vm
28+ Scenario Outline: Livepatch is not enabled by default and can't be enabled on interim releases
29+ Given a `<release>` machine with ubuntu-advantage-tools installed
30+ When I run `pro status --all` with sudo
31+ Then stdout matches regexp:
32+ """
33+ livepatch +no +Current kernel is not supported
34+ """
35+ When I attach `contract_token` with sudo
36+ When I run `pro status --all` with sudo
37+ Then stdout matches regexp:
38+ """
39+ livepatch +yes +n/a +Canonical Livepatch service
40+ """
41+ When I verify that running `pro enable livepatch` `with sudo` exits `1`
42+ Then stdout contains substring:
43+ """
44+ Livepatch is not available for Ubuntu <pretty_name>.
45+ """
46+ When I run `pro status --all` with sudo
47+ Then stdout matches regexp:
48+ """
49+ livepatch +yes +n/a +Canonical Livepatch service
50+ """
51+ Examples: ubuntu release
52+ | release | pretty_name |
53+ | kinetic | 22.10 (Kinetic Kudu) |
54+ | lunar | 23.04 (Lunar Lobster) |
55diff --git a/tools/run-integration-tests.py b/tools/run-integration-tests.py
56index 2bcd577..710e580 100644
57--- a/tools/run-integration-tests.py
58+++ b/tools/run-integration-tests.py
59@@ -35,7 +35,7 @@ PLATFORM_SERIES_TESTS = {
60 "gcppro": ["xenial", "bionic", "focal", "jammy"],
61 "gcppro-fips": ["bionic", "focal"],
62 "lxd": ["xenial", "bionic", "focal", "jammy", "kinetic", "lunar"],
63- "vm": ["xenial", "bionic", "focal", "jammy"],
64+ "vm": ["xenial", "bionic", "focal", "jammy", "kinetic", "lunar"],
65 "upgrade": ["xenial", "bionic", "focal", "jammy", "kinetic"],
66 }
67
68diff --git a/tox.ini b/tox.ini
69index d07577c..5d77977 100644
70--- a/tox.ini
71+++ b/tox.ini
72@@ -75,6 +75,8 @@ commands =
73 behave-vm-18.04: behave -v {posargs} --tags="uses.config.machine_type.lxd.vm" --tags="series.bionic,series.all,series.lts" --tags="~upgrade"
74 behave-vm-20.04: behave -v {posargs} --tags="uses.config.machine_type.lxd.vm" --tags="series.focal,series.all,series.lts" --tags="~upgrade" --tags="~docker"
75 behave-vm-22.04: behave -v {posargs} --tags="uses.config.machine_type.lxd.vm" --tags="series.jammy,series.all,series.lts" --tags="~upgrade"
76+ behave-vm-22.10: behave -v {posargs} --tags="uses.config.machine_type.lxd.vm" --tags="series.kinetic,series.all" --tags="~upgrade"
77+ behave-vm-23.04: behave -v {posargs} --tags="uses.config.machine_type.lxd.vm" --tags="series.lunar,series.all" --tags="~upgrade"
78
79 behave-upgrade-16.04: behave -v {posargs} --tags="upgrade" --tags="series.xenial,series.all"
80 behave-upgrade-18.04: behave -v {posargs} --tags="upgrade" --tags="series.bionic,series.all"
81diff --git a/uaclient/entitlements/livepatch.py b/uaclient/entitlements/livepatch.py
82index 6b81451..e382d52 100644
83--- a/uaclient/entitlements/livepatch.py
84+++ b/uaclient/entitlements/livepatch.py
85@@ -33,9 +33,10 @@ class LivepatchEntitlement(UAEntitlement):
86 title = "Livepatch"
87 description = "Canonical Livepatch service"
88 affordance_check_arch = False
89- affordance_check_series = False
90 affordance_check_kernel_min_version = False
91 affordance_check_kernel_flavor = False
92+ # we do want to check series because livepatch errors on non-lts releases
93+ affordance_check_series = True
94
95 @property
96 def incompatible_services(self) -> Tuple[IncompatibleService, ...]:
97diff --git a/uaclient/version.py b/uaclient/version.py
98index 4f51265..7fabad9 100644
99--- a/uaclient/version.py
100+++ b/uaclient/version.py
101@@ -15,7 +15,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH
102 from uaclient.exceptions import ProcessExecutionError
103 from uaclient.system import subp
104
105-__VERSION__ = "27.14.2"
106+__VERSION__ = "27.14.3"
107 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
108
109 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"

Subscribers

People subscribed via source and target branches

to status/vote changes: