Merge ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-29.4-mantic into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel
- Git
- lp:~lamoura/ubuntu/+source/ubuntu-advantage-tools
- upload-29.4-mantic
- Merge into ubuntu/devel
Proposed by
Lucas Albuquerque Medeiros de Moura
Status: | Merged |
---|---|
Merged at revision: | 1bec70b5ccbe93ecdc479cae9563d1746823c51f |
Proposed branch: | ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-29.4-mantic |
Merge into: | ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel |
Diff against target: |
929 lines (+112/-133) 19 files modified
debian/changelog (+7/-0) dev/null (+0/-10) features/airgapped.feature (+2/-2) features/anbox.feature (+0/-14) features/api_packages.feature (+1/-1) features/attach_validtoken.feature (+4/-3) features/attached_commands.feature (+1/-1) features/attached_enable.feature (+20/-24) features/attached_status.feature (+5/-1) features/cloud.py (+2/-2) features/enable_fips_vm.feature (+6/-6) features/livepatch.feature (+2/-0) features/proxy_config.feature (+6/-0) features/ubuntu_pro.feature (+21/-21) features/ubuntu_pro_fips.feature (+24/-24) features/unattached_status.feature (+9/-21) setup.py (+0/-1) tools/run-integration-tests.py (+1/-1) uaclient/version.py (+1/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andreas Hasenack | Approve | ||
Canonical Server Reporter | Pending | ||
Review via email: mp+451117@code.launchpad.net |
Commit message
Description of the change
Release 29.4 of the Pro client. This release only removes the pin files for the ESM services
To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote : | # |
Uploaded to lunar, jammy, focal, bionic, and xenial, with .changes file starting on version 29.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/changelog b/debian/changelog | |||
2 | index 308c1d7..e37337b 100644 | |||
3 | --- a/debian/changelog | |||
4 | +++ b/debian/changelog | |||
5 | @@ -1,3 +1,10 @@ | |||
6 | 1 | ubuntu-advantage-tools (29.4) mantic; urgency=medium | ||
7 | 2 | |||
8 | 3 | * esm: remove static config file that pin packages from esm-infra | ||
9 | 4 | and esm-apps | ||
10 | 5 | |||
11 | 6 | -- Lucas Moura <lucas.moura@canonical.com> Wed, 06 Sep 2023 10:50:50 -0300 | ||
12 | 7 | |||
13 | 1 | ubuntu-advantage-tools (29.3) mantic; urgency=medium | 8 | ubuntu-advantage-tools (29.3) mantic; urgency=medium |
14 | 2 | 9 | ||
15 | 3 | * api: fix circular import that prevents enabled_services | 10 | * api: fix circular import that prevents enabled_services |
16 | diff --git a/features/airgapped.feature b/features/airgapped.feature | |||
17 | index 2f7d806..0547b74 100644 | |||
18 | --- a/features/airgapped.feature | |||
19 | +++ b/features/airgapped.feature | |||
20 | @@ -41,11 +41,11 @@ Feature: Performing attach using ua-airgapped | |||
21 | 41 | When I run `apt-cache policy hello` with sudo | 41 | When I run `apt-cache policy hello` with sudo |
22 | 42 | Then stdout matches regexp: | 42 | Then stdout matches regexp: |
23 | 43 | """ | 43 | """ |
25 | 44 | 510 .*:9000/ubuntu jammy-apps-security/main | 44 | 500 .*:9000/ubuntu jammy-apps-security/main |
26 | 45 | """ | 45 | """ |
27 | 46 | And stdout matches regexp: | 46 | And stdout matches regexp: |
28 | 47 | """ | 47 | """ |
30 | 48 | 510 .*:8000/ubuntu jammy-infra-security/main | 48 | 500 .*:8000/ubuntu jammy-infra-security/main |
31 | 49 | """ | 49 | """ |
32 | 50 | Then I verify that running `pro refresh` `with sudo` exits `0` | 50 | Then I verify that running `pro refresh` `with sudo` exits `0` |
33 | 51 | 51 | ||
34 | diff --git a/features/anbox.feature b/features/anbox.feature | |||
35 | index 424b575..4c4db4d 100644 | |||
36 | --- a/features/anbox.feature | |||
37 | +++ b/features/anbox.feature | |||
38 | @@ -74,20 +74,6 @@ Feature: Enable anbox on Ubuntu | |||
39 | 74 | Given a `<release>` machine with ubuntu-advantage-tools installed | 74 | Given a `<release>` machine with ubuntu-advantage-tools installed |
40 | 75 | When I attach `contract_token` with sudo and options `--no-auto-enable` | 75 | When I attach `contract_token` with sudo and options `--no-auto-enable` |
41 | 76 | And I run `snap remove lxd` with sudo | 76 | And I run `snap remove lxd` with sudo |
42 | 77 | And I set the machine token overlay to the following yaml | ||
43 | 78 | """ | ||
44 | 79 | machineTokenInfo: | ||
45 | 80 | contractInfo: | ||
46 | 81 | resourceEntitlements: | ||
47 | 82 | - type: anbox-cloud | ||
48 | 83 | directives: | ||
49 | 84 | requiredSnaps: | ||
50 | 85 | - name: lxd | ||
51 | 86 | channel: 5.0/stable | ||
52 | 87 | - name: amc | ||
53 | 88 | - name: anbox-cloud-appliance | ||
54 | 89 | classicConfinementSupport: true | ||
55 | 90 | """ | ||
56 | 91 | And I run `pro enable anbox-cloud --access-only --assume-yes` with sudo | 77 | And I run `pro enable anbox-cloud --access-only --assume-yes` with sudo |
57 | 92 | Then I will see the following on stdout: | 78 | Then I will see the following on stdout: |
58 | 93 | """ | 79 | """ |
59 | diff --git a/features/api_packages.feature b/features/api_packages.feature | |||
60 | index daef767..3123d62 100644 | |||
61 | --- a/features/api_packages.feature | |||
62 | +++ b/features/api_packages.feature | |||
63 | @@ -35,4 +35,4 @@ Feature: Package related API endpoints | |||
64 | 35 | | bionic | libcurl4 | 7.58.0-2ubuntu3 | standard-security | | 35 | | bionic | libcurl4 | 7.58.0-2ubuntu3 | standard-security | |
65 | 36 | | focal | libcurl4 | 7.68.0-1ubuntu2 | standard-security | | 36 | | focal | libcurl4 | 7.68.0-1ubuntu2 | standard-security | |
66 | 37 | | jammy | libcurl4 | 7.81.0-1 | standard-security | | 37 | | jammy | libcurl4 | 7.81.0-1 | standard-security | |
68 | 38 | | lunar | libcurl4 | 7.88.1-8ubuntu1 | standard-updates | | 38 | | lunar | libcurl4 | 7.88.1-8ubuntu1 | standard-security | |
69 | diff --git a/features/attach_validtoken.feature b/features/attach_validtoken.feature | |||
70 | index d987db0..77da4b3 100644 | |||
71 | --- a/features/attach_validtoken.feature | |||
72 | +++ b/features/attach_validtoken.feature | |||
73 | @@ -28,6 +28,7 @@ Feature: Command behaviour when attaching a machine to an Ubuntu Pro | |||
74 | 28 | esm-infra +yes +n/a +Expanded Security Maintenance for Infrastructure | 28 | esm-infra +yes +n/a +Expanded Security Maintenance for Infrastructure |
75 | 29 | fips +yes +n/a +NIST-certified core packages | 29 | fips +yes +n/a +NIST-certified core packages |
76 | 30 | fips-updates +yes +n/a +NIST-certified core packages with priority security updates | 30 | fips-updates +yes +n/a +NIST-certified core packages with priority security updates |
77 | 31 | landscape +yes +<landscape> +Management and administration tool for Ubuntu | ||
78 | 31 | livepatch +yes +n/a +Canonical Livepatch service | 32 | livepatch +yes +n/a +Canonical Livepatch service |
79 | 32 | """ | 33 | """ |
80 | 33 | And stdout does not match regexp: | 34 | And stdout does not match regexp: |
81 | @@ -36,9 +37,9 @@ Feature: Command behaviour when attaching a machine to an Ubuntu Pro | |||
82 | 36 | """ | 37 | """ |
83 | 37 | 38 | ||
84 | 38 | Examples: ubuntu release | 39 | Examples: ubuntu release |
88 | 39 | | release | | 40 | | release | landscape | |
89 | 40 | | lunar | | 41 | | lunar | n/a | |
90 | 41 | | mantic | | 42 | | mantic | yes | |
91 | 42 | 43 | ||
92 | 43 | @series.lts | 44 | @series.lts |
93 | 44 | @uses.config.machine_type.lxd-container | 45 | @uses.config.machine_type.lxd-container |
94 | diff --git a/features/attached_commands.feature b/features/attached_commands.feature | |||
95 | index 932ffce..6f5c45f 100644 | |||
96 | --- a/features/attached_commands.feature | |||
97 | +++ b/features/attached_commands.feature | |||
98 | @@ -263,7 +263,7 @@ Feature: Command behaviour when attached to an Ubuntu Pro subscription | |||
99 | 263 | Examples: ubuntu release | 263 | Examples: ubuntu release |
100 | 264 | | release | anbox | esm-apps | cc-eal | cis | fips | fips-update | ros | cis_or_usg | realtime-kernel | | 264 | | release | anbox | esm-apps | cc-eal | cis | fips | fips-update | ros | cis_or_usg | realtime-kernel | |
101 | 265 | | xenial | no | yes | yes | yes | yes | yes | yes | cis | no | | 265 | | xenial | no | yes | yes | yes | yes | yes | yes | cis | no | |
103 | 266 | | bionic | yes | yes | yes | yes | yes | yes | yes | cis | no | | 266 | | bionic | no | yes | yes | yes | yes | yes | yes | cis | no | |
104 | 267 | | focal | yes | yes | no | yes | yes | yes | no | usg | no | | 267 | | focal | yes | yes | no | yes | yes | yes | no | usg | no | |
105 | 268 | | jammy | yes | yes | no | yes | no | no | no | usg | yes | | 268 | | jammy | yes | yes | no | yes | no | no | no | usg | yes | |
106 | 269 | 269 | ||
107 | diff --git a/features/attached_enable.feature b/features/attached_enable.feature | |||
108 | index a779da4..7501b19 100644 | |||
109 | --- a/features/attached_enable.feature | |||
110 | +++ b/features/attached_enable.feature | |||
111 | @@ -233,20 +233,16 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
112 | 233 | See: sudo pro status | 233 | See: sudo pro status |
113 | 234 | """ | 234 | """ |
114 | 235 | When I run `apt-cache policy` with sudo | 235 | When I run `apt-cache policy` with sudo |
116 | 236 | Then apt-cache policy for the following url has permission `510` | 236 | Then apt-cache policy for the following url has permission `500` |
117 | 237 | """ | 237 | """ |
118 | 238 | <esm-infra-url> <release>-infra-updates/main amd64 Packages | 238 | <esm-infra-url> <release>-infra-updates/main amd64 Packages |
119 | 239 | """ | 239 | """ |
120 | 240 | And apt-cache policy for the following url has permission `510` | ||
121 | 241 | """ | ||
122 | 242 | <esm-infra-url> <release>-infra-security/main amd64 Packages | ||
123 | 243 | """ | ||
124 | 244 | And I verify that running `apt update` `with sudo` exits `0` | 240 | And I verify that running `apt update` `with sudo` exits `0` |
125 | 245 | When I run `apt install -y <infra-pkg>` with sudo, retrying exit [100] | 241 | When I run `apt install -y <infra-pkg>` with sudo, retrying exit [100] |
126 | 246 | And I run `apt-cache policy <infra-pkg>` as non-root | 242 | And I run `apt-cache policy <infra-pkg>` as non-root |
127 | 247 | Then stdout matches regexp: | 243 | Then stdout matches regexp: |
128 | 248 | """ | 244 | """ |
130 | 249 | \s*510 <esm-infra-url> <release>-infra-security/main amd64 Packages | 245 | \s*500 <esm-infra-url> <release>-infra-security/main amd64 Packages |
131 | 250 | """ | 246 | """ |
132 | 251 | 247 | ||
133 | 252 | Examples: ubuntu release | 248 | Examples: ubuntu release |
134 | @@ -573,7 +569,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
135 | 573 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure | 569 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure |
136 | 574 | fips +yes +disabled +NIST-certified core packages | 570 | fips +yes +disabled +NIST-certified core packages |
137 | 575 | fips-updates +yes +disabled +NIST-certified core packages with priority security updates | 571 | fips-updates +yes +disabled +NIST-certified core packages with priority security updates |
139 | 576 | livepatch +yes +enabled +Canonical Livepatch service | 572 | livepatch +yes +<livepatch_status> +Canonical Livepatch service |
140 | 577 | """ | 573 | """ |
141 | 578 | When I run `pro disable livepatch` with sudo | 574 | When I run `pro disable livepatch` with sudo |
142 | 579 | Then I verify that running `canonical-livepatch status` `with sudo` exits `1` | 575 | Then I verify that running `canonical-livepatch status` `with sudo` exits `1` |
143 | @@ -599,9 +595,9 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
144 | 599 | """ | 595 | """ |
145 | 600 | 596 | ||
146 | 601 | Examples: ubuntu release | 597 | Examples: ubuntu release |
150 | 602 | | release | | 598 | | release | livepatch_status | |
151 | 603 | | xenial | | 599 | | xenial | warning | |
152 | 604 | | bionic | | 600 | | bionic | enabled | |
153 | 605 | 601 | ||
154 | 606 | @series.xenial | 602 | @series.xenial |
155 | 607 | @series.bionic | 603 | @series.bionic |
156 | @@ -661,7 +657,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
157 | 661 | When I run `pro status` with sudo | 657 | When I run `pro status` with sudo |
158 | 662 | Then stdout matches regexp: | 658 | Then stdout matches regexp: |
159 | 663 | """ | 659 | """ |
161 | 664 | livepatch +yes +enabled | 660 | livepatch +yes +<livepatch_status> |
162 | 665 | """ | 661 | """ |
163 | 666 | When I run `canonical-livepatch status` with sudo | 662 | When I run `canonical-livepatch status` with sudo |
164 | 667 | Then stdout matches regexp: | 663 | Then stdout matches regexp: |
165 | @@ -670,9 +666,9 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
166 | 670 | """ | 666 | """ |
167 | 671 | 667 | ||
168 | 672 | Examples: ubuntu release | 668 | Examples: ubuntu release |
172 | 673 | | release | | 669 | | release | livepatch_status | |
173 | 674 | | xenial | | 670 | | xenial | warning | |
174 | 675 | | bionic | | 671 | | bionic | enabled | |
175 | 676 | 672 | ||
176 | 677 | @series.xenial | 673 | @series.xenial |
177 | 678 | @uses.config.machine_type.lxd-vm | 674 | @uses.config.machine_type.lxd-vm |
178 | @@ -687,12 +683,12 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
179 | 687 | When I run `pro status` with sudo | 683 | When I run `pro status` with sudo |
180 | 688 | Then stdout matches regexp: | 684 | Then stdout matches regexp: |
181 | 689 | """ | 685 | """ |
183 | 690 | livepatch +yes +enabled | 686 | livepatch +yes +warning |
184 | 691 | """ | 687 | """ |
185 | 692 | When I run `pro api u.pro.security.status.reboot_required.v1` with sudo | 688 | When I run `pro api u.pro.security.status.reboot_required.v1` with sudo |
186 | 693 | Then stdout matches regexp: | 689 | Then stdout matches regexp: |
187 | 694 | """ | 690 | """ |
189 | 695 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "no", "reboot_required_packages": {"kernel_packages": null, "standard_packages": null}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} | 691 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "no", "reboot_required_packages": {"kernel_packages": null, "standard_packages": null}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} |
190 | 696 | """ | 692 | """ |
191 | 697 | When I run `pro system reboot-required` as non-root | 693 | When I run `pro system reboot-required` as non-root |
192 | 698 | Then I will see the following on stdout: | 694 | Then I will see the following on stdout: |
193 | @@ -703,7 +699,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
194 | 703 | And I run `pro api u.pro.security.status.reboot_required.v1` as non-root | 699 | And I run `pro api u.pro.security.status.reboot_required.v1` as non-root |
195 | 704 | Then stdout matches regexp: | 700 | Then stdout matches regexp: |
196 | 705 | """ | 701 | """ |
198 | 706 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \[\], "standard_packages": \["libc6"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} | 702 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \[\], "standard_packages": \["libc6"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} |
199 | 707 | """ | 703 | """ |
200 | 708 | When I run `pro system reboot-required` as non-root | 704 | When I run `pro system reboot-required` as non-root |
201 | 709 | Then I will see the following on stdout: | 705 | Then I will see the following on stdout: |
202 | @@ -720,18 +716,18 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
203 | 720 | And I run `pro api u.pro.security.status.reboot_required.v1` as non-root | 716 | And I run `pro api u.pro.security.status.reboot_required.v1` as non-root |
204 | 721 | Then stdout matches regexp: | 717 | Then stdout matches regexp: |
205 | 722 | """ | 718 | """ |
207 | 723 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "yes-kernel-livepatches-applied", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \[\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} | 719 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \[\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} |
208 | 724 | """ | 720 | """ |
209 | 725 | When I run `pro system reboot-required` as non-root | 721 | When I run `pro system reboot-required` as non-root |
210 | 726 | Then I will see the following on stdout: | 722 | Then I will see the following on stdout: |
211 | 727 | """ | 723 | """ |
213 | 728 | yes-kernel-livepatches-applied | 724 | yes |
214 | 729 | """ | 725 | """ |
215 | 730 | When I run `apt-get install dbus -y` with sudo | 726 | When I run `apt-get install dbus -y` with sudo |
216 | 731 | And I run `pro api u.pro.security.status.reboot_required.v1` with sudo | 727 | And I run `pro api u.pro.security.status.reboot_required.v1` with sudo |
217 | 732 | Then stdout matches regexp: | 728 | Then stdout matches regexp: |
218 | 733 | """ | 729 | """ |
220 | 734 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \["dbus"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} | 730 | {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \["dbus"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]} |
221 | 735 | """ | 731 | """ |
222 | 736 | When I run `pro system reboot-required` as non-root | 732 | When I run `pro system reboot-required` as non-root |
223 | 737 | Then I will see the following on stdout: | 733 | Then I will see the following on stdout: |
224 | @@ -1128,11 +1124,11 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
225 | 1128 | """ | 1124 | """ |
226 | 1129 | And I verify that running `apt update` `with sudo` exits `0` | 1125 | And I verify that running `apt update` `with sudo` exits `0` |
227 | 1130 | When I run `apt-cache policy` as non-root | 1126 | When I run `apt-cache policy` as non-root |
229 | 1131 | Then apt-cache policy for the following url has permission `510` | 1127 | Then apt-cache policy for the following url has permission `500` |
230 | 1132 | """ | 1128 | """ |
231 | 1133 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages | 1129 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages |
232 | 1134 | """ | 1130 | """ |
234 | 1135 | And apt-cache policy for the following url has permission `510` | 1131 | And apt-cache policy for the following url has permission `500` |
235 | 1136 | """ | 1132 | """ |
236 | 1137 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 1133 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
237 | 1138 | """ | 1134 | """ |
238 | @@ -1142,8 +1138,8 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription | |||
239 | 1142 | Then stdout matches regexp: | 1138 | Then stdout matches regexp: |
240 | 1143 | """ | 1139 | """ |
241 | 1144 | Version table: | 1140 | Version table: |
244 | 1145 | \s*\*\*\* .* 510 | 1141 | \s*\*\*\* .* 500 |
245 | 1146 | \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 1142 | \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
246 | 1147 | """ | 1143 | """ |
247 | 1148 | When I verify that running `pro enable esm-apps` `with sudo` exits `1` | 1144 | When I verify that running `pro enable esm-apps` `with sudo` exits `1` |
248 | 1149 | Then stdout matches regexp | 1145 | Then stdout matches regexp |
249 | diff --git a/features/attached_status.feature b/features/attached_status.feature | |||
250 | index b59f0bd..a6bcd07 100644 | |||
251 | --- a/features/attached_status.feature | |||
252 | +++ b/features/attached_status.feature | |||
253 | @@ -116,6 +116,7 @@ Feature: Attached status | |||
254 | 116 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure | 116 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure |
255 | 117 | fips +yes +disabled +NIST-certified core packages | 117 | fips +yes +disabled +NIST-certified core packages |
256 | 118 | fips-updates +yes +disabled +NIST-certified core packages with priority security updates | 118 | fips-updates +yes +disabled +NIST-certified core packages with priority security updates |
257 | 119 | landscape +yes +n/a +Management and administration tool for Ubuntu | ||
258 | 119 | livepatch +yes +n/a +Canonical Livepatch service | 120 | livepatch +yes +n/a +Canonical Livepatch service |
259 | 120 | realtime-kernel +yes +n/a +Ubuntu kernel with PREEMPT_RT patches integrated | 121 | realtime-kernel +yes +n/a +Ubuntu kernel with PREEMPT_RT patches integrated |
260 | 121 | ros +yes +disabled +Security Updates for the Robot Operating System | 122 | ros +yes +disabled +Security Updates for the Robot Operating System |
261 | @@ -139,6 +140,7 @@ Feature: Attached status | |||
262 | 139 | Then stdout matches regexp: | 140 | Then stdout matches regexp: |
263 | 140 | """ | 141 | """ |
264 | 141 | SERVICE +ENTITLED +STATUS +DESCRIPTION | 142 | SERVICE +ENTITLED +STATUS +DESCRIPTION |
265 | 143 | anbox-cloud +yes +disabled +.* | ||
266 | 142 | esm-apps +yes +enabled +Expanded Security Maintenance for Applications | 144 | esm-apps +yes +enabled +Expanded Security Maintenance for Applications |
267 | 143 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure | 145 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure |
268 | 144 | fips +yes +disabled +NIST-certified core packages | 146 | fips +yes +disabled +NIST-certified core packages |
269 | @@ -153,12 +155,13 @@ Feature: Attached status | |||
270 | 153 | Then stdout matches regexp: | 155 | Then stdout matches regexp: |
271 | 154 | """ | 156 | """ |
272 | 155 | SERVICE +ENTITLED +STATUS +DESCRIPTION | 157 | SERVICE +ENTITLED +STATUS +DESCRIPTION |
274 | 156 | anbox-cloud +yes +n/a +.* | 158 | anbox-cloud +yes +disabled +.* |
275 | 157 | cc-eal +yes +n/a +Common Criteria EAL2 Provisioning Packages | 159 | cc-eal +yes +n/a +Common Criteria EAL2 Provisioning Packages |
276 | 158 | esm-apps +yes +enabled +Expanded Security Maintenance for Applications | 160 | esm-apps +yes +enabled +Expanded Security Maintenance for Applications |
277 | 159 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure | 161 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure |
278 | 160 | fips +yes +disabled +NIST-certified core packages | 162 | fips +yes +disabled +NIST-certified core packages |
279 | 161 | fips-updates +yes +disabled +NIST-certified core packages with priority security updates | 163 | fips-updates +yes +disabled +NIST-certified core packages with priority security updates |
280 | 164 | landscape +yes +n/a +Management and administration tool for Ubuntu | ||
281 | 162 | livepatch +yes +n/a +Canonical Livepatch service | 165 | livepatch +yes +n/a +Canonical Livepatch service |
282 | 163 | realtime-kernel +yes +n/a +Ubuntu kernel with PREEMPT_RT patches integrated | 166 | realtime-kernel +yes +n/a +Ubuntu kernel with PREEMPT_RT patches integrated |
283 | 164 | ros +yes +n/a +Security Updates for the Robot Operating System | 167 | ros +yes +n/a +Security Updates for the Robot Operating System |
284 | @@ -201,6 +204,7 @@ Feature: Attached status | |||
285 | 201 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure | 204 | esm-infra +yes +enabled +Expanded Security Maintenance for Infrastructure |
286 | 202 | fips +yes +n/a +NIST-certified core packages | 205 | fips +yes +n/a +NIST-certified core packages |
287 | 203 | fips-updates +yes +n/a +NIST-certified core packages with priority security updates | 206 | fips-updates +yes +n/a +NIST-certified core packages with priority security updates |
288 | 207 | landscape +yes +n/a +Management and administration tool for Ubuntu | ||
289 | 204 | livepatch +yes +n/a +Canonical Livepatch service | 208 | livepatch +yes +n/a +Canonical Livepatch service |
290 | 205 | realtime-kernel +yes +n/a +Ubuntu kernel with PREEMPT_RT patches integrated | 209 | realtime-kernel +yes +n/a +Ubuntu kernel with PREEMPT_RT patches integrated |
291 | 206 | ├ generic +yes +n/a +Generic version of the RT kernel \(default\) | 210 | ├ generic +yes +n/a +Generic version of the RT kernel \(default\) |
292 | diff --git a/features/cloud.py b/features/cloud.py | |||
293 | index 8f3bcb0..cef4719 100644 | |||
294 | --- a/features/cloud.py | |||
295 | +++ b/features/cloud.py | |||
296 | @@ -327,9 +327,9 @@ class EC2(Cloud): | |||
297 | 327 | An AWS cloud provider instance | 327 | An AWS cloud provider instance |
298 | 328 | """ | 328 | """ |
299 | 329 | if not image_name: | 329 | if not image_name: |
301 | 330 | if series == "xenial" and "pro" not in machine_type: | 330 | if series in ("xenial", "bionic") and "pro" not in machine_type: |
302 | 331 | logging.debug( | 331 | logging.debug( |
304 | 332 | "defaulting to non-daily image for awsgeneric-16.04" | 332 | "defaulting to non-daily image for awsgeneric-[16|18].04" |
305 | 333 | ) | 333 | ) |
306 | 334 | daily = False | 334 | daily = False |
307 | 335 | else: | 335 | else: |
308 | diff --git a/features/enable_fips_vm.feature b/features/enable_fips_vm.feature | |||
309 | index f27a5e9..5724375 100644 | |||
310 | --- a/features/enable_fips_vm.feature | |||
311 | +++ b/features/enable_fips_vm.feature | |||
312 | @@ -285,7 +285,7 @@ Feature: FIPS enablement in lxd VMs | |||
313 | 285 | """ | 285 | """ |
314 | 286 | Then stdout matches regexp: | 286 | Then stdout matches regexp: |
315 | 287 | """ | 287 | """ |
317 | 288 | livepatch +yes enabled | 288 | livepatch +yes +<livepatch_status> |
318 | 289 | """ | 289 | """ |
319 | 290 | When I run `pro enable fips-updates --assume-yes` with sudo | 290 | When I run `pro enable fips-updates --assume-yes` with sudo |
320 | 291 | Then stdout matches regexp: | 291 | Then stdout matches regexp: |
321 | @@ -302,7 +302,7 @@ Feature: FIPS enablement in lxd VMs | |||
322 | 302 | """ | 302 | """ |
323 | 303 | Then stdout matches regexp: | 303 | Then stdout matches regexp: |
324 | 304 | """ | 304 | """ |
326 | 305 | livepatch +yes enabled | 305 | livepatch +yes +<livepatch_status> |
327 | 306 | """ | 306 | """ |
328 | 307 | When I reboot the machine | 307 | When I reboot the machine |
329 | 308 | And I run `uname -r` as non-root | 308 | And I run `uname -r` as non-root |
330 | @@ -322,12 +322,12 @@ Feature: FIPS enablement in lxd VMs | |||
331 | 322 | """ | 322 | """ |
332 | 323 | Then stdout matches regexp: | 323 | Then stdout matches regexp: |
333 | 324 | """ | 324 | """ |
335 | 325 | livepatch +yes enabled | 325 | livepatch +yes +enabled |
336 | 326 | """ | 326 | """ |
337 | 327 | Examples: ubuntu release | 327 | Examples: ubuntu release |
341 | 328 | | release | | 328 | | release | livepatch_status | |
342 | 329 | | xenial | | 329 | | xenial | warning | |
343 | 330 | | bionic | | 330 | | bionic | enabled | |
344 | 331 | 331 | ||
345 | 332 | @slow | 332 | @slow |
346 | 333 | @series.focal | 333 | @series.focal |
347 | diff --git a/features/livepatch.feature b/features/livepatch.feature | |||
348 | index 4899ce0..7388ea1 100644 | |||
349 | --- a/features/livepatch.feature | |||
350 | +++ b/features/livepatch.feature | |||
351 | @@ -8,6 +8,8 @@ Feature: Livepatch | |||
352 | 8 | Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed | 8 | Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed |
353 | 9 | When I change config key `livepatch_url` to use value `<livepatch_url>` | 9 | When I change config key `livepatch_url` to use value `<livepatch_url>` |
354 | 10 | Then I verify that no files exist matching `/home/ubuntu/.cache/ubuntu-pro/livepatch-kernel-support-cache.json` | 10 | Then I verify that no files exist matching `/home/ubuntu/.cache/ubuntu-pro/livepatch-kernel-support-cache.json` |
355 | 11 | # This is needed because `apt update` creates this file before, and we need to make sure it is created correctly later | ||
356 | 12 | When I delete the file `/run/ubuntu-advantage/livepatch-kernel-support-cache.json` | ||
357 | 11 | When I run `pro status` as non-root | 13 | When I run `pro status` as non-root |
358 | 12 | Then I verify that files exist matching `/home/ubuntu/.cache/ubuntu-pro/livepatch-kernel-support-cache.json` | 14 | Then I verify that files exist matching `/home/ubuntu/.cache/ubuntu-pro/livepatch-kernel-support-cache.json` |
359 | 13 | Then I verify that no files exist matching `/run/ubuntu-advantage/livepatch-kernel-support-cache.json` | 15 | Then I verify that no files exist matching `/run/ubuntu-advantage/livepatch-kernel-support-cache.json` |
360 | diff --git a/features/proxy_config.feature b/features/proxy_config.feature | |||
361 | index 755f5dc..73f432e 100644 | |||
362 | --- a/features/proxy_config.feature | |||
363 | +++ b/features/proxy_config.feature | |||
364 | @@ -123,6 +123,7 @@ Feature: Proxy configuration | |||
365 | 123 | """ | 123 | """ |
366 | 124 | \"http://host:port\" is not a valid url. Not setting as proxy | 124 | \"http://host:port\" is not a valid url. Not setting as proxy |
367 | 125 | """ | 125 | """ |
368 | 126 | When I run `apt install python3-pycurl -y` with sudo | ||
369 | 126 | And I verify that running `pro config set ua_apt_https_proxy=https://localhost:12345` `with sudo` exits `1` | 127 | And I verify that running `pro config set ua_apt_https_proxy=https://localhost:12345` `with sudo` exits `1` |
370 | 127 | Then stderr matches regexp: | 128 | Then stderr matches regexp: |
371 | 128 | """ | 129 | """ |
372 | @@ -231,6 +232,7 @@ Feature: Proxy configuration | |||
373 | 231 | "https_proxy": "invalidurls" | 232 | "https_proxy": "invalidurls" |
374 | 232 | } | 233 | } |
375 | 233 | """ | 234 | """ |
376 | 235 | And I run `apt install python3-pycurl -y` with sudo | ||
377 | 234 | And I verify that running `pro refresh config` `with sudo` exits `1` | 236 | And I verify that running `pro refresh config` `with sudo` exits `1` |
378 | 235 | Then stderr matches regexp: | 237 | Then stderr matches regexp: |
379 | 236 | """ | 238 | """ |
380 | @@ -509,6 +511,7 @@ Feature: Proxy configuration | |||
381 | 509 | "ua_apt_https_proxy": "https://localhost:12345" | 511 | "ua_apt_https_proxy": "https://localhost:12345" |
382 | 510 | } | 512 | } |
383 | 511 | """ | 513 | """ |
384 | 514 | And I run `apt install python3-pycurl -y` with sudo | ||
385 | 512 | And I verify that running `pro refresh config` `with sudo` exits `1` | 515 | And I verify that running `pro refresh config` `with sudo` exits `1` |
386 | 513 | Then stderr matches regexp: | 516 | Then stderr matches regexp: |
387 | 514 | """ | 517 | """ |
388 | @@ -604,6 +607,7 @@ Feature: Proxy configuration | |||
389 | 604 | "ua_apt_https_proxy": "http://wronguser:wrongpassword@$behave_var{machine-ip proxy}:3128" | 607 | "ua_apt_https_proxy": "http://wronguser:wrongpassword@$behave_var{machine-ip proxy}:3128" |
390 | 605 | } | 608 | } |
391 | 606 | """ | 609 | """ |
392 | 610 | And I run `apt install python3-pycurl -y` with sudo | ||
393 | 607 | And I verify that running `pro refresh config` `with sudo` exits `1` | 611 | And I verify that running `pro refresh config` `with sudo` exits `1` |
394 | 608 | Then stderr matches regexp: | 612 | Then stderr matches regexp: |
395 | 609 | """ | 613 | """ |
396 | @@ -745,6 +749,7 @@ Feature: Proxy configuration | |||
397 | 745 | """ | 749 | """ |
398 | 746 | \"http://host:port\" is not a valid url. Not setting as proxy | 750 | \"http://host:port\" is not a valid url. Not setting as proxy |
399 | 747 | """ | 751 | """ |
400 | 752 | When I run `apt install python3-pycurl -y` with sudo | ||
401 | 748 | And I verify that running `pro config set global_apt_https_proxy=https://localhost:12345` `with sudo` exits `1` | 753 | And I verify that running `pro config set global_apt_https_proxy=https://localhost:12345` `with sudo` exits `1` |
402 | 749 | Then stderr matches regexp: | 754 | Then stderr matches regexp: |
403 | 750 | """ | 755 | """ |
404 | @@ -1151,6 +1156,7 @@ Feature: Proxy configuration | |||
405 | 1151 | Acquire::http::Proxy \".*:3128\"; | 1156 | Acquire::http::Proxy \".*:3128\"; |
406 | 1152 | Acquire::https::Proxy \".*:3128\"; | 1157 | Acquire::https::Proxy \".*:3128\"; |
407 | 1153 | """ | 1158 | """ |
408 | 1159 | When I run `apt install python3-pycurl -y` with sudo | ||
409 | 1154 | And I verify that running `pro config set apt_https_proxy=https://localhost:12345` `with sudo` exits `1` | 1160 | And I verify that running `pro config set apt_https_proxy=https://localhost:12345` `with sudo` exits `1` |
410 | 1155 | Then stdout matches regexp: | 1161 | Then stdout matches regexp: |
411 | 1156 | """ | 1162 | """ |
412 | diff --git a/features/ubuntu_pro.feature b/features/ubuntu_pro.feature | |||
413 | index d7578d4..a5f1b98 100644 | |||
414 | --- a/features/ubuntu_pro.feature | |||
415 | +++ b/features/ubuntu_pro.feature | |||
416 | @@ -289,19 +289,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
417 | 289 | To use a different subscription first run: sudo pro detach. | 289 | To use a different subscription first run: sudo pro detach. |
418 | 290 | """ | 290 | """ |
419 | 291 | When I run `apt-cache policy` with sudo | 291 | When I run `apt-cache policy` with sudo |
421 | 292 | Then apt-cache policy for the following url has permission `510` | 292 | Then apt-cache policy for the following url has permission `500` |
422 | 293 | """ | 293 | """ |
423 | 294 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 294 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
424 | 295 | """ | 295 | """ |
426 | 296 | And apt-cache policy for the following url has permission `510` | 296 | And apt-cache policy for the following url has permission `500` |
427 | 297 | """ | 297 | """ |
428 | 298 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 298 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
429 | 299 | """ | 299 | """ |
431 | 300 | And apt-cache policy for the following url has permission `510` | 300 | And apt-cache policy for the following url has permission `500` |
432 | 301 | """ | 301 | """ |
433 | 302 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages | 302 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages |
434 | 303 | """ | 303 | """ |
436 | 304 | And apt-cache policy for the following url has permission `510` | 304 | And apt-cache policy for the following url has permission `500` |
437 | 305 | """ | 305 | """ |
438 | 306 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 306 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
439 | 307 | """ | 307 | """ |
440 | @@ -310,7 +310,7 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
441 | 310 | And I run `apt-cache policy <infra-pkg>` as non-root | 310 | And I run `apt-cache policy <infra-pkg>` as non-root |
442 | 311 | Then stdout matches regexp: | 311 | Then stdout matches regexp: |
443 | 312 | """ | 312 | """ |
445 | 313 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 313 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
446 | 314 | """ | 314 | """ |
447 | 315 | And stdout matches regexp: | 315 | And stdout matches regexp: |
448 | 316 | """ | 316 | """ |
449 | @@ -321,8 +321,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
450 | 321 | Then stdout matches regexp: | 321 | Then stdout matches regexp: |
451 | 322 | """ | 322 | """ |
452 | 323 | Version table: | 323 | Version table: |
455 | 324 | \s*\*\*\* .* 510 | 324 | \s*\*\*\* .* 500 |
456 | 325 | \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 325 | \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
457 | 326 | """ | 326 | """ |
458 | 327 | When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following: | 327 | When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following: |
459 | 328 | """ | 328 | """ |
460 | @@ -416,19 +416,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
461 | 416 | To use a different subscription first run: sudo pro detach. | 416 | To use a different subscription first run: sudo pro detach. |
462 | 417 | """ | 417 | """ |
463 | 418 | When I run `apt-cache policy` with sudo | 418 | When I run `apt-cache policy` with sudo |
465 | 419 | Then apt-cache policy for the following url has permission `510` | 419 | Then apt-cache policy for the following url has permission `500` |
466 | 420 | """ | 420 | """ |
467 | 421 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 421 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
468 | 422 | """ | 422 | """ |
470 | 423 | And apt-cache policy for the following url has permission `510` | 423 | And apt-cache policy for the following url has permission `500` |
471 | 424 | """ | 424 | """ |
472 | 425 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 425 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
473 | 426 | """ | 426 | """ |
475 | 427 | And apt-cache policy for the following url has permission `510` | 427 | And apt-cache policy for the following url has permission `500` |
476 | 428 | """ | 428 | """ |
477 | 429 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages | 429 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages |
478 | 430 | """ | 430 | """ |
480 | 431 | And apt-cache policy for the following url has permission `510` | 431 | And apt-cache policy for the following url has permission `500` |
481 | 432 | """ | 432 | """ |
482 | 433 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 433 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
483 | 434 | """ | 434 | """ |
484 | @@ -437,7 +437,7 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
485 | 437 | And I run `apt-cache policy <infra-pkg>` as non-root | 437 | And I run `apt-cache policy <infra-pkg>` as non-root |
486 | 438 | Then stdout matches regexp: | 438 | Then stdout matches regexp: |
487 | 439 | """ | 439 | """ |
489 | 440 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 440 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
490 | 441 | """ | 441 | """ |
491 | 442 | And stdout matches regexp: | 442 | And stdout matches regexp: |
492 | 443 | """ | 443 | """ |
493 | @@ -448,8 +448,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
494 | 448 | Then stdout matches regexp: | 448 | Then stdout matches regexp: |
495 | 449 | """ | 449 | """ |
496 | 450 | Version table: | 450 | Version table: |
499 | 451 | \s*\*\*\* .* 510 | 451 | \s*\*\*\* .* 500 |
500 | 452 | \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 452 | \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
501 | 453 | """ | 453 | """ |
502 | 454 | When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following: | 454 | When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following: |
503 | 455 | """ | 455 | """ |
504 | @@ -542,19 +542,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
505 | 542 | To use a different subscription first run: sudo pro detach. | 542 | To use a different subscription first run: sudo pro detach. |
506 | 543 | """ | 543 | """ |
507 | 544 | When I run `apt-cache policy` with sudo | 544 | When I run `apt-cache policy` with sudo |
509 | 545 | Then apt-cache policy for the following url has permission `510` | 545 | Then apt-cache policy for the following url has permission `500` |
510 | 546 | """ | 546 | """ |
511 | 547 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 547 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
512 | 548 | """ | 548 | """ |
514 | 549 | And apt-cache policy for the following url has permission `510` | 549 | And apt-cache policy for the following url has permission `500` |
515 | 550 | """ | 550 | """ |
516 | 551 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 551 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
517 | 552 | """ | 552 | """ |
519 | 553 | And apt-cache policy for the following url has permission `510` | 553 | And apt-cache policy for the following url has permission `500` |
520 | 554 | """ | 554 | """ |
521 | 555 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages | 555 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages |
522 | 556 | """ | 556 | """ |
524 | 557 | And apt-cache policy for the following url has permission `510` | 557 | And apt-cache policy for the following url has permission `500` |
525 | 558 | """ | 558 | """ |
526 | 559 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 559 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
527 | 560 | """ | 560 | """ |
528 | @@ -563,7 +563,7 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
529 | 563 | And I run `apt-cache policy <infra-pkg>` as non-root | 563 | And I run `apt-cache policy <infra-pkg>` as non-root |
530 | 564 | Then stdout matches regexp: | 564 | Then stdout matches regexp: |
531 | 565 | """ | 565 | """ |
533 | 566 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 566 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
534 | 567 | """ | 567 | """ |
535 | 568 | And stdout matches regexp: | 568 | And stdout matches regexp: |
536 | 569 | """ | 569 | """ |
537 | @@ -574,8 +574,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image | |||
538 | 574 | Then stdout matches regexp: | 574 | Then stdout matches regexp: |
539 | 575 | """ | 575 | """ |
540 | 576 | Version table: | 576 | Version table: |
543 | 577 | \s*\*\*\* .* 510 | 577 | \s*\*\*\* .* 500 |
544 | 578 | \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 578 | \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
545 | 579 | """ | 579 | """ |
546 | 580 | When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following: | 580 | When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following: |
547 | 581 | """ | 581 | """ |
548 | diff --git a/features/ubuntu_pro_fips.feature b/features/ubuntu_pro_fips.feature | |||
549 | index df764cf..729e5f4 100644 | |||
550 | --- a/features/ubuntu_pro_fips.feature | |||
551 | +++ b/features/ubuntu_pro_fips.feature | |||
552 | @@ -60,19 +60,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
553 | 60 | To use a different subscription first run: sudo pro detach. | 60 | To use a different subscription first run: sudo pro detach. |
554 | 61 | """ | 61 | """ |
555 | 62 | When I run `apt-cache policy` with sudo | 62 | When I run `apt-cache policy` with sudo |
557 | 63 | Then apt-cache policy for the following url has permission `510` | 63 | Then apt-cache policy for the following url has permission `500` |
558 | 64 | """ | 64 | """ |
559 | 65 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 65 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
560 | 66 | """ | 66 | """ |
562 | 67 | And apt-cache policy for the following url has permission `510` | 67 | And apt-cache policy for the following url has permission `500` |
563 | 68 | """ | 68 | """ |
564 | 69 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 69 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
565 | 70 | """ | 70 | """ |
567 | 71 | And apt-cache policy for the following url has permission `510` | 71 | And apt-cache policy for the following url has permission `500` |
568 | 72 | """ | 72 | """ |
569 | 73 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages | 73 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages |
570 | 74 | """ | 74 | """ |
572 | 75 | And apt-cache policy for the following url has permission `510` | 75 | And apt-cache policy for the following url has permission `500` |
573 | 76 | """ | 76 | """ |
574 | 77 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 77 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
575 | 78 | """ | 78 | """ |
576 | @@ -85,11 +85,11 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
577 | 85 | And I run `apt-cache policy <infra-pkg>` as non-root | 85 | And I run `apt-cache policy <infra-pkg>` as non-root |
578 | 86 | Then stdout matches regexp: | 86 | Then stdout matches regexp: |
579 | 87 | """ | 87 | """ |
581 | 88 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 88 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
582 | 89 | """ | 89 | """ |
583 | 90 | Then stdout matches regexp: | 90 | Then stdout matches regexp: |
584 | 91 | """ | 91 | """ |
586 | 92 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 92 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
587 | 93 | """ | 93 | """ |
588 | 94 | And stdout matches regexp: | 94 | And stdout matches regexp: |
589 | 95 | """ | 95 | """ |
590 | @@ -100,8 +100,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
591 | 100 | Then stdout matches regexp: | 100 | Then stdout matches regexp: |
592 | 101 | """ | 101 | """ |
593 | 102 | Version table: | 102 | Version table: |
596 | 103 | \s*\*\*\* .* 510 | 103 | \s*\*\*\* .* 500 |
597 | 104 | \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 104 | \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
598 | 105 | """ | 105 | """ |
599 | 106 | When I run `pro enable fips-updates --assume-yes` with sudo | 106 | When I run `pro enable fips-updates --assume-yes` with sudo |
600 | 107 | Then I will see the following on stdout: | 107 | Then I will see the following on stdout: |
601 | @@ -280,19 +280,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
602 | 280 | To use a different subscription first run: sudo pro detach. | 280 | To use a different subscription first run: sudo pro detach. |
603 | 281 | """ | 281 | """ |
604 | 282 | When I run `apt-cache policy` with sudo | 282 | When I run `apt-cache policy` with sudo |
606 | 283 | Then apt-cache policy for the following url has permission `510` | 283 | Then apt-cache policy for the following url has permission `500` |
607 | 284 | """ | 284 | """ |
608 | 285 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 285 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
609 | 286 | """ | 286 | """ |
611 | 287 | And apt-cache policy for the following url has permission `510` | 287 | And apt-cache policy for the following url has permission `500` |
612 | 288 | """ | 288 | """ |
613 | 289 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 289 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
614 | 290 | """ | 290 | """ |
616 | 291 | And apt-cache policy for the following url has permission `510` | 291 | And apt-cache policy for the following url has permission `500` |
617 | 292 | """ | 292 | """ |
618 | 293 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages | 293 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages |
619 | 294 | """ | 294 | """ |
621 | 295 | And apt-cache policy for the following url has permission `510` | 295 | And apt-cache policy for the following url has permission `500` |
622 | 296 | """ | 296 | """ |
623 | 297 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 297 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
624 | 298 | """ | 298 | """ |
625 | @@ -305,11 +305,11 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
626 | 305 | And I run `apt-cache policy <infra-pkg>` as non-root | 305 | And I run `apt-cache policy <infra-pkg>` as non-root |
627 | 306 | Then stdout matches regexp: | 306 | Then stdout matches regexp: |
628 | 307 | """ | 307 | """ |
630 | 308 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 308 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
631 | 309 | """ | 309 | """ |
632 | 310 | Then stdout matches regexp: | 310 | Then stdout matches regexp: |
633 | 311 | """ | 311 | """ |
635 | 312 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 312 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
636 | 313 | """ | 313 | """ |
637 | 314 | And stdout matches regexp: | 314 | And stdout matches regexp: |
638 | 315 | """ | 315 | """ |
639 | @@ -320,8 +320,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
640 | 320 | Then stdout matches regexp: | 320 | Then stdout matches regexp: |
641 | 321 | """ | 321 | """ |
642 | 322 | Version table: | 322 | Version table: |
645 | 323 | \s*\*\*\* .* 510 | 323 | \s*\*\*\* .* 500 |
646 | 324 | \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 324 | \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
647 | 325 | """ | 325 | """ |
648 | 326 | When I run `pro enable fips-updates --assume-yes` with sudo | 326 | When I run `pro enable fips-updates --assume-yes` with sudo |
649 | 327 | Then I will see the following on stdout: | 327 | Then I will see the following on stdout: |
650 | @@ -553,19 +553,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
651 | 553 | To use a different subscription first run: sudo pro detach. | 553 | To use a different subscription first run: sudo pro detach. |
652 | 554 | """ | 554 | """ |
653 | 555 | When I run `apt-cache policy` with sudo | 555 | When I run `apt-cache policy` with sudo |
655 | 556 | Then apt-cache policy for the following url has permission `510` | 556 | Then apt-cache policy for the following url has permission `500` |
656 | 557 | """ | 557 | """ |
657 | 558 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 558 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
658 | 559 | """ | 559 | """ |
660 | 560 | And apt-cache policy for the following url has permission `510` | 560 | And apt-cache policy for the following url has permission `500` |
661 | 561 | """ | 561 | """ |
662 | 562 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 562 | https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
663 | 563 | """ | 563 | """ |
665 | 564 | And apt-cache policy for the following url has permission `510` | 564 | And apt-cache policy for the following url has permission `500` |
666 | 565 | """ | 565 | """ |
667 | 566 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages | 566 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages |
668 | 567 | """ | 567 | """ |
670 | 568 | And apt-cache policy for the following url has permission `510` | 568 | And apt-cache policy for the following url has permission `500` |
671 | 569 | """ | 569 | """ |
672 | 570 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 570 | https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
673 | 571 | """ | 571 | """ |
674 | @@ -578,11 +578,11 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
675 | 578 | And I run `apt-cache policy <infra-pkg>` as non-root | 578 | And I run `apt-cache policy <infra-pkg>` as non-root |
676 | 579 | Then stdout matches regexp: | 579 | Then stdout matches regexp: |
677 | 580 | """ | 580 | """ |
679 | 581 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages | 581 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages |
680 | 582 | """ | 582 | """ |
681 | 583 | Then stdout matches regexp: | 583 | Then stdout matches regexp: |
682 | 584 | """ | 584 | """ |
684 | 585 | \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages | 585 | \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages |
685 | 586 | """ | 586 | """ |
686 | 587 | And stdout matches regexp: | 587 | And stdout matches regexp: |
687 | 588 | """ | 588 | """ |
688 | @@ -593,8 +593,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image | |||
689 | 593 | Then stdout matches regexp: | 593 | Then stdout matches regexp: |
690 | 594 | """ | 594 | """ |
691 | 595 | Version table: | 595 | Version table: |
694 | 596 | \s*\*\*\* .* 510 | 596 | \s*\*\*\* .* 500 |
695 | 597 | \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages | 597 | \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages |
696 | 598 | """ | 598 | """ |
697 | 599 | When I run `pro enable fips-updates --assume-yes` with sudo | 599 | When I run `pro enable fips-updates --assume-yes` with sudo |
698 | 600 | Then I will see the following on stdout: | 600 | Then I will see the following on stdout: |
699 | diff --git a/features/unattached_status.feature b/features/unattached_status.feature | |||
700 | index 6eea754..80a35e9 100644 | |||
701 | --- a/features/unattached_status.feature | |||
702 | +++ b/features/unattached_status.feature | |||
703 | @@ -58,7 +58,6 @@ Feature: Unattached status | |||
704 | 58 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 58 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
705 | 59 | fips +yes +NIST-certified core packages | 59 | fips +yes +NIST-certified core packages |
706 | 60 | fips-updates +yes +NIST-certified core packages with priority security updates | 60 | fips-updates +yes +NIST-certified core packages with priority security updates |
707 | 61 | landscape +yes +Management and administration tool for Ubuntu | ||
708 | 62 | livepatch +yes +(Canonical Livepatch service|Current kernel is not supported) | 61 | livepatch +yes +(Canonical Livepatch service|Current kernel is not supported) |
709 | 63 | ros +yes +Security Updates for the Robot Operating System | 62 | ros +yes +Security Updates for the Robot Operating System |
710 | 64 | ros-updates +yes +All Updates for the Robot Operating System | 63 | ros-updates +yes +All Updates for the Robot Operating System |
711 | @@ -80,7 +79,7 @@ Feature: Unattached status | |||
712 | 80 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 79 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
713 | 81 | fips +yes +NIST-certified core packages | 80 | fips +yes +NIST-certified core packages |
714 | 82 | fips-updates +yes +NIST-certified core packages with priority security updates | 81 | fips-updates +yes +NIST-certified core packages with priority security updates |
716 | 83 | landscape +yes +Management and administration tool for Ubuntu | 82 | landscape +no +Management and administration tool for Ubuntu |
717 | 84 | livepatch +yes +(Canonical Livepatch service|Current kernel is not supported) | 83 | livepatch +yes +(Canonical Livepatch service|Current kernel is not supported) |
718 | 85 | realtime-kernel +no +Ubuntu kernel with PREEMPT_RT patches integrated | 84 | realtime-kernel +no +Ubuntu kernel with PREEMPT_RT patches integrated |
719 | 86 | ros +yes +Security Updates for the Robot Operating System | 85 | ros +yes +Security Updates for the Robot Operating System |
720 | @@ -106,7 +105,6 @@ Feature: Unattached status | |||
721 | 106 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 105 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
722 | 107 | fips +yes +NIST-certified core packages | 106 | fips +yes +NIST-certified core packages |
723 | 108 | fips-updates +yes +NIST-certified core packages with priority security updates | 107 | fips-updates +yes +NIST-certified core packages with priority security updates |
724 | 109 | landscape +yes +Management and administration tool for Ubuntu | ||
725 | 110 | livepatch +yes +(Canonical Livepatch service|Current kernel is not supported) | 108 | livepatch +yes +(Canonical Livepatch service|Current kernel is not supported) |
726 | 111 | ros +yes +Security Updates for the Robot Operating System | 109 | ros +yes +Security Updates for the Robot Operating System |
727 | 112 | ros-updates +yes +All Updates for the Robot Operating System | 110 | ros-updates +yes +All Updates for the Robot Operating System |
728 | @@ -139,7 +137,6 @@ Feature: Unattached status | |||
729 | 139 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 137 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
730 | 140 | fips +yes +NIST-certified core packages | 138 | fips +yes +NIST-certified core packages |
731 | 141 | fips-updates +yes +NIST-certified core packages with priority security updates | 139 | fips-updates +yes +NIST-certified core packages with priority security updates |
732 | 142 | landscape +yes +Management and administration tool for Ubuntu | ||
733 | 143 | livepatch +yes +Canonical Livepatch service | 140 | livepatch +yes +Canonical Livepatch service |
734 | 144 | usg +yes +Security compliance and audit tools | 141 | usg +yes +Security compliance and audit tools |
735 | 145 | 142 | ||
736 | @@ -159,7 +156,7 @@ Feature: Unattached status | |||
737 | 159 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 156 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
738 | 160 | fips +yes +NIST-certified core packages | 157 | fips +yes +NIST-certified core packages |
739 | 161 | fips-updates +yes +NIST-certified core packages with priority security updates | 158 | fips-updates +yes +NIST-certified core packages with priority security updates |
741 | 162 | landscape +yes +Management and administration tool for Ubuntu | 159 | landscape +no +Management and administration tool for Ubuntu |
742 | 163 | livepatch +yes +Canonical Livepatch service | 160 | livepatch +yes +Canonical Livepatch service |
743 | 164 | realtime-kernel +no +Ubuntu kernel with PREEMPT_RT patches integrated | 161 | realtime-kernel +no +Ubuntu kernel with PREEMPT_RT patches integrated |
744 | 165 | ros +no +Security Updates for the Robot Operating System | 162 | ros +no +Security Updates for the Robot Operating System |
745 | @@ -184,7 +181,6 @@ Feature: Unattached status | |||
746 | 184 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 181 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
747 | 185 | fips +yes +NIST-certified core packages | 182 | fips +yes +NIST-certified core packages |
748 | 186 | fips-updates +yes +NIST-certified core packages with priority security updates | 183 | fips-updates +yes +NIST-certified core packages with priority security updates |
749 | 187 | landscape +yes +Management and administration tool for Ubuntu | ||
750 | 188 | livepatch +yes +Canonical Livepatch service | 184 | livepatch +yes +Canonical Livepatch service |
751 | 189 | usg +yes +Security compliance and audit tools | 185 | usg +yes +Security compliance and audit tools |
752 | 190 | 186 | ||
753 | @@ -213,7 +209,6 @@ Feature: Unattached status | |||
754 | 213 | anbox-cloud +yes +.* | 209 | anbox-cloud +yes +.* |
755 | 214 | esm-apps +yes +Expanded Security Maintenance for Applications | 210 | esm-apps +yes +Expanded Security Maintenance for Applications |
756 | 215 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 211 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
757 | 216 | landscape +yes +Management and administration tool for Ubuntu | ||
758 | 217 | livepatch +yes +Canonical Livepatch service | 212 | livepatch +yes +Canonical Livepatch service |
759 | 218 | realtime-kernel +yes +Ubuntu kernel with PREEMPT_RT patches integrated | 213 | realtime-kernel +yes +Ubuntu kernel with PREEMPT_RT patches integrated |
760 | 219 | usg +yes +Security compliance and audit tools | 214 | usg +yes +Security compliance and audit tools |
761 | @@ -234,7 +229,7 @@ Feature: Unattached status | |||
762 | 234 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 229 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
763 | 235 | fips +no +NIST-certified core packages | 230 | fips +no +NIST-certified core packages |
764 | 236 | fips-updates +no +NIST-certified core packages with priority security updates | 231 | fips-updates +no +NIST-certified core packages with priority security updates |
766 | 237 | landscape +yes +Management and administration tool for Ubuntu | 232 | landscape +no +Management and administration tool for Ubuntu |
767 | 238 | livepatch +yes +Canonical Livepatch service | 233 | livepatch +yes +Canonical Livepatch service |
768 | 239 | realtime-kernel +yes +Ubuntu kernel with PREEMPT_RT patches integrated | 234 | realtime-kernel +yes +Ubuntu kernel with PREEMPT_RT patches integrated |
769 | 240 | ros +no +Security Updates for the Robot Operating System | 235 | ros +no +Security Updates for the Robot Operating System |
770 | @@ -257,7 +252,6 @@ Feature: Unattached status | |||
771 | 257 | anbox-cloud +yes +.* | 252 | anbox-cloud +yes +.* |
772 | 258 | esm-apps +yes +Expanded Security Maintenance for Applications | 253 | esm-apps +yes +Expanded Security Maintenance for Applications |
773 | 259 | esm-infra +yes +Expanded Security Maintenance for Infrastructure | 254 | esm-infra +yes +Expanded Security Maintenance for Infrastructure |
774 | 260 | landscape +yes +Management and administration tool for Ubuntu | ||
775 | 261 | livepatch +yes +Canonical Livepatch service | 255 | livepatch +yes +Canonical Livepatch service |
776 | 262 | realtime-kernel +yes +Ubuntu kernel with PREEMPT_RT patches integrated | 256 | realtime-kernel +yes +Ubuntu kernel with PREEMPT_RT patches integrated |
777 | 263 | usg +yes +Security compliance and audit tools | 257 | usg +yes +Security compliance and audit tools |
778 | @@ -292,7 +286,6 @@ Feature: Unattached status | |||
779 | 292 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 286 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
780 | 293 | fips +yes +yes +no +NIST-certified core packages | 287 | fips +yes +yes +no +NIST-certified core packages |
781 | 294 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates | 288 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates |
782 | 295 | landscape +yes +yes +no +Management and administration tool for Ubuntu | ||
783 | 296 | livepatch +yes +yes +yes +Canonical Livepatch service | 289 | livepatch +yes +yes +yes +Canonical Livepatch service |
784 | 297 | """ | 290 | """ |
785 | 298 | When I do a preflight check for `contract_token` with the all flag | 291 | When I do a preflight check for `contract_token` with the all flag |
786 | @@ -306,7 +299,7 @@ Feature: Unattached status | |||
787 | 306 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 299 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
788 | 307 | fips +yes +yes +no +NIST-certified core packages | 300 | fips +yes +yes +no +NIST-certified core packages |
789 | 308 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates | 301 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates |
791 | 309 | landscape +yes +yes +no +Management and administration tool for Ubuntu | 302 | landscape +no +yes +no +Management and administration tool for Ubuntu |
792 | 310 | livepatch +yes +yes +yes +Canonical Livepatch service | 303 | livepatch +yes +yes +yes +Canonical Livepatch service |
793 | 311 | realtime-kernel +no +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated | 304 | realtime-kernel +no +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated |
794 | 312 | ros +yes +yes +no +Security Updates for the Robot Operating System | 305 | ros +yes +yes +no +Security Updates for the Robot Operating System |
795 | @@ -355,7 +348,6 @@ Feature: Unattached status | |||
796 | 355 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 348 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
797 | 356 | fips +yes +yes +no +NIST-certified core packages | 349 | fips +yes +yes +no +NIST-certified core packages |
798 | 357 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates | 350 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates |
799 | 358 | landscape +yes +yes +no +Management and administration tool for Ubuntu | ||
800 | 359 | livepatch +yes +yes +yes +Canonical Livepatch service | 351 | livepatch +yes +yes +yes +Canonical Livepatch service |
801 | 360 | usg +yes +yes +no +Security compliance and audit tools | 352 | usg +yes +yes +no +Security compliance and audit tools |
802 | 361 | """ | 353 | """ |
803 | @@ -369,7 +361,7 @@ Feature: Unattached status | |||
804 | 369 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 361 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
805 | 370 | fips +yes +yes +no +NIST-certified core packages | 362 | fips +yes +yes +no +NIST-certified core packages |
806 | 371 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates | 363 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates |
808 | 372 | landscape +yes +yes +no +Management and administration tool for Ubuntu | 364 | landscape +no +yes +no +Management and administration tool for Ubuntu |
809 | 373 | livepatch +yes +yes +yes +Canonical Livepatch service | 365 | livepatch +yes +yes +yes +Canonical Livepatch service |
810 | 374 | realtime-kernel +no +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated | 366 | realtime-kernel +no +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated |
811 | 375 | ros +no +yes +no +Security Updates for the Robot Operating System | 367 | ros +no +yes +no +Security Updates for the Robot Operating System |
812 | @@ -417,7 +409,6 @@ Feature: Unattached status | |||
813 | 417 | anbox-cloud +yes +.* | 409 | anbox-cloud +yes +.* |
814 | 418 | esm-apps +yes +yes +yes +Expanded Security Maintenance for Applications | 410 | esm-apps +yes +yes +yes +Expanded Security Maintenance for Applications |
815 | 419 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 411 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
816 | 420 | landscape +yes +yes +no +Management and administration tool for Ubuntu | ||
817 | 421 | livepatch +yes +yes +yes +Canonical Livepatch service | 412 | livepatch +yes +yes +yes +Canonical Livepatch service |
818 | 422 | realtime-kernel +yes +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated | 413 | realtime-kernel +yes +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated |
819 | 423 | usg +yes +yes +no +Security compliance and audit tools | 414 | usg +yes +yes +no +Security compliance and audit tools |
820 | @@ -432,7 +423,7 @@ Feature: Unattached status | |||
821 | 432 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 423 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
822 | 433 | fips +no +yes +no +NIST-certified core packages | 424 | fips +no +yes +no +NIST-certified core packages |
823 | 434 | fips-updates +no +yes +no +NIST-certified core packages with priority security updates | 425 | fips-updates +no +yes +no +NIST-certified core packages with priority security updates |
825 | 435 | landscape +yes +yes +no +Management and administration tool for Ubuntu | 426 | landscape +no +yes +no +Management and administration tool for Ubuntu |
826 | 436 | livepatch +yes +yes +yes +Canonical Livepatch service | 427 | livepatch +yes +yes +yes +Canonical Livepatch service |
827 | 437 | realtime-kernel +yes +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated | 428 | realtime-kernel +yes +yes +no +Ubuntu kernel with PREEMPT_RT patches integrated |
828 | 438 | ros +no +yes +no +Security Updates for the Robot Operating System | 429 | ros +no +yes +no +Security Updates for the Robot Operating System |
829 | @@ -507,8 +498,7 @@ Feature: Unattached status | |||
830 | 507 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 498 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
831 | 508 | fips +yes +yes +no +NIST-certified core packages | 499 | fips +yes +yes +no +NIST-certified core packages |
832 | 509 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates | 500 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates |
835 | 510 | (landscape +(yes|no) +yes +no +Management and administration tool for Ubuntu)? | 501 | livepatch +yes +yes +yes +Canonical Livepatch service |
834 | 511 | ?livepatch +yes +yes +yes +Canonical Livepatch service | ||
836 | 512 | ros +yes +no +no +Security Updates for the Robot Operating System | 502 | ros +yes +no +no +Security Updates for the Robot Operating System |
837 | 513 | ros-updates +yes +no +no +All Updates for the Robot Operating System | 503 | ros-updates +yes +no +no +All Updates for the Robot Operating System |
838 | 514 | """ | 504 | """ |
839 | @@ -553,8 +543,7 @@ Feature: Unattached status | |||
840 | 553 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 543 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
841 | 554 | fips +yes +yes +no +NIST-certified core packages | 544 | fips +yes +yes +no +NIST-certified core packages |
842 | 555 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates | 545 | fips-updates +yes +yes +no +NIST-certified core packages with priority security updates |
845 | 556 | (landscape +(yes|no) +yes +no +Management and administration tool for Ubuntu)? | 546 | livepatch +yes +yes +yes +Canonical Livepatch service |
844 | 557 | ?livepatch +yes +yes +yes +Canonical Livepatch service | ||
846 | 558 | usg +yes +yes +no +Security compliance and audit tools | 547 | usg +yes +yes +no +Security compliance and audit tools |
847 | 559 | """ | 548 | """ |
848 | 560 | 549 | ||
849 | @@ -596,8 +585,7 @@ Feature: Unattached status | |||
850 | 596 | esm-apps +yes +no +no +Expanded Security Maintenance for Applications | 585 | esm-apps +yes +no +no +Expanded Security Maintenance for Applications |
851 | 597 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure | 586 | esm-infra +yes +yes +yes +Expanded Security Maintenance for Infrastructure |
852 | 598 | fips +yes +yes +no +NIST-certified core packages | 587 | fips +yes +yes +no +NIST-certified core packages |
855 | 599 | (landscape +(yes|no) +yes +no +Management and administration tool for Ubuntu)? | 588 | livepatch +yes +yes +yes +Canonical Livepatch service |
854 | 600 | ?livepatch +yes +yes +yes +Canonical Livepatch service | ||
856 | 601 | """ | 589 | """ |
857 | 602 | 590 | ||
858 | 603 | Examples: ubuntu release | 591 | Examples: ubuntu release |
859 | diff --git a/preferences.d/ubuntu-pro-esm-apps b/preferences.d/ubuntu-pro-esm-apps | |||
860 | 604 | deleted file mode 100644 | 592 | deleted file mode 100644 |
861 | index 5ded6f8..0000000 | |||
862 | --- a/preferences.d/ubuntu-pro-esm-apps | |||
863 | +++ /dev/null | |||
864 | @@ -1,11 +0,0 @@ | |||
865 | 1 | # This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools | ||
866 | 2 | # package. It has no effect if Ubuntu Pro services are not in use since no | ||
867 | 3 | # other apt repositories are expected to match o=UbuntuESMApps. | ||
868 | 4 | # | ||
869 | 5 | # Pin esm-apps packages to a slightly higher value than the default, | ||
870 | 6 | # so those are preferred over a non-ESM package from the archive when the | ||
871 | 7 | # service is enabled. | ||
872 | 8 | |||
873 | 9 | Package: * | ||
874 | 10 | Pin: release o=UbuntuESMApps | ||
875 | 11 | Pin-Priority: 510 | ||
876 | diff --git a/preferences.d/ubuntu-pro-esm-infra b/preferences.d/ubuntu-pro-esm-infra | |||
877 | 12 | deleted file mode 100644 | 0 | deleted file mode 100644 |
878 | index e956e0a..0000000 | |||
879 | --- a/preferences.d/ubuntu-pro-esm-infra | |||
880 | +++ /dev/null | |||
881 | @@ -1,10 +0,0 @@ | |||
882 | 1 | # This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools | ||
883 | 2 | # package. It has no effect if Ubuntu Pro services are not in use since no | ||
884 | 3 | # other apt repositories are expected to match o=UbuntuESM. | ||
885 | 4 | # | ||
886 | 5 | # Pin esm-infra packages to a slightly higher value than the default, | ||
887 | 6 | # so those are preferred over a non-ESM package from the archive when the | ||
888 | 7 | # service is enabled. | ||
889 | 8 | Package: * | ||
890 | 9 | Pin: release o=UbuntuESM | ||
891 | 10 | Pin-Priority: 510 | ||
892 | diff --git a/setup.py b/setup.py | |||
893 | index bccdfed..a1105f2 100644 | |||
894 | --- a/setup.py | |||
895 | +++ b/setup.py | |||
896 | @@ -40,7 +40,6 @@ def _get_data_files(): | |||
897 | 40 | "/etc/update-manager/release-upgrades.d/", | 40 | "/etc/update-manager/release-upgrades.d/", |
898 | 41 | ["release-upgrades.d/ubuntu-advantage-upgrades.cfg"], | 41 | ["release-upgrades.d/ubuntu-advantage-upgrades.cfg"], |
899 | 42 | ), | 42 | ), |
900 | 43 | ("/etc/apt/preferences.d", glob.glob("preferences.d/*")), | ||
901 | 44 | (defaults.CONFIG_DEFAULTS["data_dir"], []), | 43 | (defaults.CONFIG_DEFAULTS["data_dir"], []), |
902 | 45 | ("/lib/systemd/system", glob.glob("systemd/*")), | 44 | ("/lib/systemd/system", glob.glob("systemd/*")), |
903 | 46 | ( | 45 | ( |
904 | diff --git a/tools/run-integration-tests.py b/tools/run-integration-tests.py | |||
905 | index ed16645..cc373ce 100644 | |||
906 | --- a/tools/run-integration-tests.py | |||
907 | +++ b/tools/run-integration-tests.py | |||
908 | @@ -24,7 +24,7 @@ TOKEN_TO_ENVVAR = { | |||
909 | 24 | } | 24 | } |
910 | 25 | 25 | ||
911 | 26 | PLATFORM_SERIES_TESTS = { | 26 | PLATFORM_SERIES_TESTS = { |
913 | 27 | "azuregeneric": ["xenial", "bionic", "focal", "jammy"], | 27 | "azuregeneric": ["xenial", "bionic", "focal", "jammy", "lunar"], |
914 | 28 | "azurepro": ["xenial", "bionic", "focal", "jammy"], | 28 | "azurepro": ["xenial", "bionic", "focal", "jammy"], |
915 | 29 | "azurepro-fips": ["xenial", "bionic", "focal"], | 29 | "azurepro-fips": ["xenial", "bionic", "focal"], |
916 | 30 | "awsgeneric": ["xenial", "bionic", "focal", "jammy"], | 30 | "awsgeneric": ["xenial", "bionic", "focal", "jammy"], |
917 | diff --git a/uaclient/version.py b/uaclient/version.py | |||
918 | index 4d61635..fc599da 100644 | |||
919 | --- a/uaclient/version.py | |||
920 | +++ b/uaclient/version.py | |||
921 | @@ -15,7 +15,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH | |||
922 | 15 | from uaclient.exceptions import ProcessExecutionError | 15 | from uaclient.exceptions import ProcessExecutionError |
923 | 16 | from uaclient.system import subp | 16 | from uaclient.system import subp |
924 | 17 | 17 | ||
926 | 18 | __VERSION__ = "29.3" | 18 | __VERSION__ = "29.4" |
927 | 19 | PACKAGED_VERSION = "@@PACKAGED_VERSION@@" | 19 | PACKAGED_VERSION = "@@PACKAGED_VERSION@@" |
928 | 20 | 20 | ||
929 | 21 | CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n" | 21 | CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n" |
The diff is comprised of the reverts, and some test changes.
The package builds find, and I checked upgrades. In mantic, we get the expected conf file prompt when upgrading to the current version in mantic, and when upgrading further to this branch's version, no further prompts and things are left as they were.
The sru/release-29 directory still contains a test for the pinning that is being dropped here, but the tests in the sru directory are not part of an automated test suite, and are only run manually when the SRU verification time comes, so this particular test can be skipped this time without issues.
+1
I will hold off on the mantic upload because the cpc team still needs the 29.3 version in the archive to test their fix for LP: #2033308.