Ubuntu
ubuntu-advantage-tools package

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

  1. Git
  2. lp:~chad.smith/ubuntu/+source/ubuntu-advantage-tools
  3. pkg-upload-24.3
  4. Merge into ubuntu/devel
Proposed by Chad Smith
Status: Approved
Approved by: Andreas Hasenack
Approved revision: 6738c9efbb48f246e088b9a3302dca3c7524164f
Proposed branch: ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:pkg-upload-24.3
Merge into: ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel
Diff against target: 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)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
git-ubuntu developers ahasenack Pending
Review via email: mp+389745@code.staging.launchpad.net

Commit message

bug-fix-only release 24.3 for upload into groovy

cherry-pick one upstream commit and one backport
 - Add fips keyring file and service name PR #1028 (GH #1026)[1]
 - Backport Limit reboot message on fips enable only if /var/run/reboot-required present [2]
 - Increment pkg version an uaclient.version.py to 24.3

Known issues still present:
tox -p auto will still exhibit a known upstream flake issue[3]

references:

[1] https://github.com/canonical/ubuntu-advantage-client/issues/1028
[2] https://github.com/canonical/ubuntu-advantage-client/commit/02de4df5561b934f91dee57a3c6b8a15253f1c66 <- upstream commit, some inapplicable to release-24 branch
[3] known upstream flake issue with tox https://github.com/canonical/ubuntu-advantage-client/issues/1062

Groovy package from this branch is available adding this PPA:
sudo add-apt-repository ppa:chad.smith/ua-client-uploads

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I took some extra precautions to verify the new gpg key that is being added by this, namely, "E233 41B2 A146 7EDB F070 57D6 C199 7C40 EDE2 2758":

- it's already referenced in tools/refresh-keyrings.sh as FIPS_KEY_ID_XENIAL="E23341B2A1467EDBF07057D6C1997C40EDE22758"
 and this is not being changed in this branch
- it produced the detached signatures https://esm.ubuntu.com/fips/ubuntu/dists/xenial/Release.gpg and https://esm.ubuntu.com/fips/ubuntu/dists/bionic/Release.gpg, and the inline signatures https://esm.ubuntu.com/fips/ubuntu/dists/xenial/InRelease and https://esm.ubuntu.com/fips/ubuntu/dists/bionic/InRelease
- the above artifacts were downloaded via https and the certificate signed by Let's Encrypt verified out OK

dep8 passes, build-time tests pass, changelog correct, +1

review: Approve
Reply
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Tagging and uploading 6738c9efbb48f246e088b9a3302dca3c7524164f

$ git push pkg upload/24.3
Enumerating objects: 54, done.
Counting objects: 100% (54/54), done.
Delta compression using up to 4 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (36/36), 6.74 KiB | 627.00 KiB/s, done.
Total 36 (delta 29), reused 34 (delta 28)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ubuntu-advantage-tools
 * [new tag] upload/24.3 -> upload/24.3

$ dput ubuntu ../ubuntu-advantage-tools_24.3_source.changes
Checking signature on .changes
gpg: ../ubuntu-advantage-tools_24.3_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../ubuntu-advantage-tools_24.3.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_24.3.dsc: done.
  Uploading ubuntu-advantage-tools_24.3.tar.xz: done.
  Uploading ubuntu-advantage-tools_24.3_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_24.3_source.changes: done.
Successfully uploaded packages.

Reply
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

It FTBFSed because of glib2.0/libffi. xnox is looking into it:

<xnox> seb128: i will fix up glib2.0 build in a moment.

Reply

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: