Merge ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:release-27-bionic into ubuntu/+source/ubuntu-advantage-tools:ubuntu/bionic-proposed
Status: | Merged |
---|---|
Approved by: | Bryce Harrington |
Approved revision: | 153a74cbb2d70e56355b9f0e07f62e07267534f4 |
Merge reported by: | Chad Smith |
Merged at revision: | 6880d56c4bf257c8b82bc9a031e5cc9b08df304c |
Proposed branch: | ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:release-27-bionic |
Merge into: | ubuntu/+source/ubuntu-advantage-tools:ubuntu/bionic-proposed |
Diff against target: |
356 lines (+179/-0) (has conflicts) 10 files modified
.gitignore (+8/-0) Jenkinsfile (+16/-0) apt-hook/Makefile (+33/-0) apt-hook/json-hook-src/go.mod (+4/-0) apt-hook/json-hook-src/json-hook.go (+42/-0) apt-hook/json-hook-src/json-hook_test.go (+34/-0) debian/changelog (+22/-0) debian/control (+7/-0) debian/rules (+4/-0) uaclient/tests/test_util.py (+9/-0) Conflict in .gitignore Conflict in Jenkinsfile Conflict in apt-hook/Makefile Conflict in apt-hook/json-hook-src/go.mod Conflict in apt-hook/json-hook-src/json-hook.go Conflict in apt-hook/json-hook-src/json-hook_test.go Conflict in debian/changelog Conflict in debian/control Conflict in debian/rules Conflict in uaclient/tests/test_util.py |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Grant Orndorff | Pending | ||
Lucas Albuquerque Medeiros de Moura | Pending | ||
Review via email: mp+401916@code.launchpad.net |
Description of the change
New upstream release of 27.0 for release into xenial
Avoiding rich commit history because this is a branch new client (python instead of bash) which represented a major upgrade that is backwards incompatible.
We will be following this verification procedure for SRU of ubuntu-
Functional equivalent debs have been uploaded to this ppa for testing https:/
to test:
$ cat > 27_test_setup.yaml <<EOF
#cloud-config
write_files:
- content: |
# Ubuntu-Advantage client config file.
contract_url: 'https:/
data_dir: /var/lib/
log_level: debug
log_file: /var/log/
features:
allow_beta: true
owner: root:root
path: /etc/ubuntu-
permissions: '0644'
apt:
sources:
ua_staging_ppa:
source: 'deb http://
keyid: 74E59E9E
packages: [ubuntu-
EOF
$ lxc launch ubuntu-
$ lxc exec test-27-b -- cloud-init status --wait --long # wait for pkg installs
$ lxc exec test-27-b -- ua version
$ lxc exec test-27-b -- ua status # show unattached
This machine is not attached to a UA subscription.
See https:/
# attach with token from https:/
$ lxc exec test-27-b -- ua attach <REDACTED>
# assert esm-infra auto enabled
# no failures on attach
lxc exect test-27-b -- grep Traceback /var/log/
# assert default contract not authorized to esm-apps
$ lxc exec test-27-b -- ua enable esm-apps
will manipulate other subcommands
csmith@ downtown: /tmp$ lxc exec test-27-b -- cloud-init status --wait --long
status: done var/lib/ cloud/seed/ nocloud- net][dsmode= net] downtown: /tmp$ lxc exec test-27-b -- ua version security_ params downtown: /tmp$ lxc exec test-27-b -- ua status
time: Wed, 28 Apr 2021 00:09:04 +0000
detail:
DataSourceNoCloud [seed=/
csmith@
27.0~18.04.1 +allow_beta +extra_
csmith@
SERVICE AVAILABLE DESCRIPTION
cc-eal no Common Criteria EAL2 Provisioning Packages
cis yes Center for Internet Security Audit Tools
esm-apps yes UA Apps: Extended Security Maintenance (ESM)
esm-infra yes UA Infra: Extended Security Maintenance (ESM)
fips yes NIST-certified FIPS modules
fips-updates yes Uncertified security updates to FIPS modules
livepatch yes Canonical Livepatch service
This machine is not attached to a UA subscription. /ubuntu. com/advantage downtown: /tmp$ lxc exec test-27-b -- ua attach <REDACTED_NO_APPS_>
See https:/
csmith@
Enabling default service esm-infra
Updating package lists
UA Infra: ESM enabled
This machine is now attached to '<email address hidden>'
SERVICE ENTITLED STATUS DESCRIPTION
cc-eal yes n/a Common Criteria EAL2 Provisioning Packages
cis yes disabled Center for Internet Security Audit Tools
esm-apps no — UA Apps: Extended Security Maintenance (ESM)
esm-infra yes enabled UA Infra: Extended Security Maintenance (ESM)
fips yes n/a NIST-certified FIPS modules
fips-updates yes n/a Uncertified security updates to FIPS modules
livepatch yes n/a Canonical Livepatch service
NOTICES
Operation in progress: ua attach
Enable services with: ua enable <service>
Account: <email address hidden> downtown: /tmp$ lxc exec test-27-b -- grep Traceback /var/log/ ubuntu- advantage. log downtown: /tmp$ lxc exec test-27-b -- ua enable esm-apps /ubuntu. com/advantage. downtown: /tmp$ lxc exec test-27-b -- ua detach downtown: /tmp$ lxc exec test-27-b -- ua attach <REDACTED_ WITH_APPS>
Subscription: <email address hidden>
csmith@
csmith@
One moment, checking your subscription first
This subscription is not entitled to UA Apps: ESM
For more information see: https:/
csmith@
Detach will disable the following service:
esm-infra
Are you sure? (y/N) y
Updating package lists
This machine is now detached.
csmith@
Enabling default service esm-apps
Updating package lists
UA Apps: ESM enabled
Enabling default service esm-infra
Updating package lists
UA Infra: ESM enabled
This machine is now attached to 'UA Applications - Essential (Physical)'
SERVICE ENTITLED STATUS DESCRIPTION
cc-eal yes n/a Common Criteria EAL2 Provisioning Packages
cis yes disabled Center for Internet Security Audit Tools
esm-apps yes enabled UA Apps: Extended Security Maintenance (ESM)
esm-infra yes enabled UA Infra: Extended Security Maintenance (ESM)
fips yes n/a NIST-certified FIPS modules
fips-updates yes n/a Uncertified security updates to FIPS modules
livepatch yes n/a ...