Release 31.2 #2964
Release 31.2 #2964
Conversation
orndorffgrant
force-pushed
the
release-31.2
branch
3 times, most recently
from
89c9713
to
2463ff5
Compare
orndorffgrant
changed the title
|
Looks good. I guess this slipped through testing though? Is there anything else that we might have missed that this new wisdom might allow us to spot, or anything else that in hindsight we should test now that we are wiser? There's nothing else that's being touched there as a result of this change, right? |
|
This LGTM, pity that we didn't spot this. This could maybe have been easily spotted by checking what |
LP: #2055046
This follows the python versions available in different Ubuntu releases. This is a weak mapping though, and may need to be improved in the future. Signed-off-by: Renan Rodrigo <renanrodrigo@canonical.com>
|
Thank you for taking a look @basak and @paride! Yes we missed this. It only occurs when logrotate runs, which is on a daily timer by default, so we wouldn't have noticed it with a generic test for system status. We do have a test that runs logrotate specifically, but it specifies our expected logrotate configuration file instead of using the system conf, so it didn't catch that the old conffile was left behind. I've updated our logrotate test in this PR to use the system logrotate conf, which reproduces this bug. I'm looking at all our conffiles and not sure if any other changes are needed. After upgrade to 31.2 from this PR: I'm not sure exactly what Notably, grant@lemur ~/c/w/ubuntu-pro-client (release-31.2)> git diff 30 preferences.d/ release-upgrades.d/
diff --git a/preferences.d/ubuntu-pro-esm-apps b/preferences.d/ubuntu-pro-esm-apps
index 5ded6f8f..ccdff4be 100644
--- a/preferences.d/ubuntu-pro-esm-apps
+++ b/preferences.d/ubuntu-pro-esm-apps
@@ -1,4 +1,4 @@
-# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools
+# This file is used by Ubuntu Pro and supplied by the ubuntu-pro-client
# package. It has no effect if Ubuntu Pro services are not in use since no
# other apt repositories are expected to match o=UbuntuESMApps.
#
diff --git a/preferences.d/ubuntu-pro-esm-infra b/preferences.d/ubuntu-pro-esm-infra
index e956e0ae..125b31d0 100644
--- a/preferences.d/ubuntu-pro-esm-infra
+++ b/preferences.d/ubuntu-pro-esm-infra
@@ -1,4 +1,4 @@
-# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools
+# This file is used by Ubuntu Pro and supplied by the ubuntu-pro-client
# package. It has no effect if Ubuntu Pro services are not in use since no
# other apt repositories are expected to match o=UbuntuESM.
#
diff --git a/release-upgrades.d/ubuntu-advantage-upgrades.cfg b/release-upgrades.d/ubuntu-advantage-upgrades.cfg
index c7da279a..c811ae03 100644
--- a/release-upgrades.d/ubuntu-advantage-upgrades.cfg
+++ b/release-upgrades.d/ubuntu-advantage-upgrades.cfg
@@ -1,4 +1,4 @@
[Sources]
Pockets=security,updates,proposed,backports,infra-security,infra-updates,apps-security,apps-updates
[Distro]
-PostInstallScripts=./xorg_fix_proprietary.py, /usr/lib/ubuntu-advantage/upgrade_lts_contract.py
+PostInstallScripts=./xorg_fix_proprietary.py, /usr/lib/ubuntu-advantage/convert_list_to_deb822.py, /usr/lib/ubuntu-advantage/upgrade_lts_contract.pyI started over with v30 of u-a-t and I modified all of the conffiles in u-a-t v30 prior to upgrade to see what would happen. During upgrade, I got prompted for We could also potentially avoid changes to ubuntu-advantage-upgrades.cfg by moving the new python code into the existing script if we think it is worth avoiding changing the conffile (CC @renanrodrigo). Changes were preserved for all other files. I also got the message: And So if the Aside: during upgrade we get these warnings. It is correct behavior to not delete these, but are the warnings avoidable? |
orndorffgrant
force-pushed
the
release-31.2
branch
from
2463ff5
to
76cec91
Compare
|
Following up here after an in person discussion and further experimentation.
We discussed this and decided it was unideal but not all that bad. I've added an additional commit that uses mv_conffile to remove this obsolete status in the happy case. Commit message copied here for convenience:
We decided these conffile changes were reasonable and prompts were okay if the user changed those files.
We decided those are fine as well. So in total, I think the latest commit I just pushed here helps a bit, and we are good to try another upload of 31.2 @paride and @basak - Let me know if you disagree or have additional findings. |
This commit uses mv_conffile on all of the conffiles in the last version of ubuntu-advantage-tools. It does not actually move them (the source and destination are the same), but this removes the "obsolete" conffile status from the ubuntu-advantage-tools package after upgrade. All of these conffiles are listed correctly for ubuntu-pro-client after upgrade. The exception is if a user had modified one of these conffiles. In that case, the changes are preserved, but the file is still listed as "obsolete" for the ubuntu-advantage-tools package after upgrade.
orndorffgrant
force-pushed
the
release-31.2
branch
from
b3062a2
to
7445707
Compare
|
The tests that failed in the most recent CI run passed in previous runs and are only failing from timeouts from the security api |
|
I uploaded to Noble: however the SRU branches need fixing (they all target Xenial). |
Why is this needed?
LP: #2055046
Test Steps
New behave test should pass