Merge ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:release-27-groovy into ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:release-27-impish

Proposed by Chad Smith
Status: Merged
Merge reported by: Chad Smith
Merged at revision: 7ea61c11b61b5d60d168c7b28cc8f5ed2c0b15fb
Proposed branch: ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:release-27-groovy
Merge into: ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:release-27-impish
Diff against target: 14 lines (+6/-0)
1 file modified
debian/changelog (+6/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Christian Ehrhardt  (community) Approve
Review via email: mp+402505@code.launchpad.net

Description of the change

Bug fix release 27.0.2 to address package build issues on riscv64 focal++.

This branch is intended for upload to groovy. Ubuntu Advantage Tools should be the same package on all Ubuntu releases. Therefore, the only differences we should see in upload branches are debian/changelog versions for each released target containing the diminished version ~XX.YY.1) <release_name>. This PR is structured with only a supplemental d/changelog version above and beyond what we target for impish release.

In Impish (pkg/ubuntu/devel) we would like to retain rich git commit history. For X, B, F, G and H we can have a single squash-merge upload

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Indeed this is now straight forward, thank you so much for cleaning this up.
I can confirm this:

6669606 (chad.smith/release-27-impish)
\- chad.smith/release-27-xenial f62420ef
\- chad.smith/release-27-bionic ddc89cf
\- chad.smith/release-27-focal d6ae6a6
\- chad.smith/release-27-groovy 882b6e5
\- chad.smith/release-27-girsute 14ab51a

The update to the changelog stanzas for the SRU of "the same content to each of those" is correct and the big "now everything is different than before" review was done for the initial 27.0.
So this is very readable - thanks!

+1 to this branch (depending on Impish to be approved as it based on that)

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-27.0.2-groovy$ dput ubuntu ubuntu-advantage-tools_27.0.2~20.10.1_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/UbuntuAdvantageTools/review-27.0.2-groovy/ubuntu-advantage-tools_27.0.2~20.10.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/UbuntuAdvantageTools/review-27.0.2-groovy/ubuntu-advantage-tools_27.0.2~20.10.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.0.2~20.10.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.0.2~20.10.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.0.2~20.10.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.0.2~20.10.1_source.changes: done.
Successfully uploaded packages.
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-27.0.2-groovy$ cd ubuntu-advantage-tools-gu
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-27.0.2-groovy/ubuntu-advantage-tools-gu$ rm debian/files
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-27.0.2-groovy/ubuntu-advantage-tools-gu$ git ubuntu tag --upload
2021/05/11 21:00:45.429627 tool_linux.go:82: cannot open snapd info file "/snap/snapd/current/usr/lib/snapd/info": open /snap/snapd/current/usr/lib/snapd/info: transport endpoint is not connected
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-27.0.2-groovy/ubuntu-advantage-tools-gu$ git ubuntu tag --upload
2021/05/11 21:01:01.518588 tool_linux.go:82: cannot open snapd info file "/snap/snapd/current/usr/lib/snapd/info": open /snap/snapd/current/usr/lib/snapd/info: transport endpoint is not connected
fatal: tag 'upload/27.0.2_20.10.1' already exists
05/11/2021 21:01:03 - ERROR:Command exited 128: git tag -a upload/27.0.2_20.10.1 HEAD -m "Upload of 27.0.2~20.10.1 to groovy"
05/11/2021 21:01:03 - ERROR:stdout: [Not captured]

05/11/2021 21:01:03 - ERROR:stderr: [Not captured]

05/11/2021 21:01:03 - ERROR:Unable to tag upload/27.0.2_20.10.1. Does it already exist (pass -f)?
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-27.0.2-groovy/ubuntu-advantage-tools-gu$ git push pkg upload/27.0.2_20.10.1
Enumerating objects: 66, done.
Counting objects: 100% (66/66), done.
Delta compression using up to 12 threads
Compressing objects: 100% (25/25), done.
Writing objects: 100% (50/50), 6.59 KiB | 6.59 MiB/s, done.
Total 50 (delta 36), reused 36 (delta 24), pack-reused 0
To ssh://git.launchpad.net/ubuntu/+source/ubuntu-advantage-tools
 * [new tag] upload/27.0.2_20.10.1 -> upload/27.0.2_20.10.1
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-27.0.2-groovy/ubu

review: Approve
7ea61c1... by Chad Smith

changelog: backport to Groovy

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6bfdddc..340d707 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+ubuntu-advantage-tools (27.0.2~20.10.1) groovy; urgency=medium
7+
8+ * Backport to Groovy
9+
10+ -- Chad Smith <chad.smith@canonical.com> Wed, 12 May 2021 10:10:45 -0600
11+
12 ubuntu-advantage-tools (27.0.2) impish; urgency=medium
13
14 * d/control:

Subscribers

People subscribed via source and target branches

to all changes: