~chad.smith/ubuntu/+source/ubuntu-advantage-tools:pkg-upload-24.3

Branch merges

Propose for merging

Approved for merging into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

Andreas Hasenack: Approve on 2020-08-24

git-ubuntu developers: Pending (ahasenack) requested 2020-08-24

Diff: 307 lines (+67/-20)

11 files modified

debian/changelog (+10/-0)
tools/refresh-keyrings.sh (+1/-1)
uaclient/entitlements/fips.py (+1/-11)
uaclient/entitlements/repo.py (+14/-0)
uaclient/entitlements/tests/test_cc.py (+3/-0)
uaclient/entitlements/tests/test_cis.py (+3/-1)
uaclient/entitlements/tests/test_fips.py (+10/-0)
uaclient/entitlements/tests/test_repo.py (+14/-6)
uaclient/status.py (+2/-0)
uaclient/util.py (+8/-0)
uaclient/version.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

6738c9e... by Chad Smith on 2020-08-24

verion: update uaclient version to 24.3 for bugfix release

5c20171... by Chad Smith on 2020-08-22

changelog

a0588d6... by Chad Smith on 2020-08-22

fips: conditional reboot text after enabling/disabling

Only report reboot required text for fips enable disable if
/var/run/reboot-required file is present.

backport of 02de4df

d5698f0... by Chad Smith on 2020-08-20

changelog: update 24.3 version for bug-fix-release

d27fb84... by Chad Smith on 2020-04-15

fips: add apt repo key for FIPS and FIPS updates (#1028)

Added the key pulled in on a trusty system using
tools/refresh-keyrings.sh.

Fixed FIPS* entitlements to source the properly named keyring
ubuntu-advantage-fips.gpg for both FIPS and FIPSUpdates since they
both use the same signing key.

Fixes: #1026

76dd5da... by Chad Smith on 2020-06-03

changelog: update 24.2 version for bug-fix-release

b84f4a1... by Chad Smith on 2020-06-03

update version to 24.2 for bug-fix-release

0c53beb... by Chad Smith on 2020-06-03

tests: add unit tests for aws-gov/aws-china cloud detection

Fixes: #1077

cc32219... by Robert C Jennings on 2020-06-02

Add AWS China and GovCloud partitions (#1077)

China and US GovCloud are separate partitions of AWS' cloud. The `cloud-id`
tool used to identify the clouds and map them to their auto-attach logic only
works in the primary aws partition. This patch adds support for China and GovCloud.

8179390... by Chad Smith on 2020-05-18

24.1 (patches unapplied)

Imported using git-ubuntu import.