Merge ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-27.13.5-lunar into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Lucas Albuquerque Medeiros de Moura]

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP.

Minor nit regarding the SRU text: "Test Case" should now be "Test Plan", and "Regression Potential" should be "Where problems could occur". These are stylistic changes; the actual content looks good.

I found an issue in the d/changelog entry, and I'm leaving a question about something that caught my attention in the test script. Once everything is addressed I can sponsor it.

Thank you.

review: Needs Fixing

[Renan Rodrigo (renanrodrigo)]

Thanks for the review, sergiodj. We'll fix the changelog entry.

[Sergio Durigan Junior (sergiodj)]

Thanks.

Uploaded:

$ dput ubuntu-advantage-tools_27.13.5~23.04.1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/ubuntu-advantage-tools/ubuntu-advantage-tools_27.13.5~23.04.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/ubuntu-advantage-tools/ubuntu-advantage-tools_27.13.5~23.04.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.13.5~23.04.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.13.5~23.04.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.13.5~23.04.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.13.5~23.04.1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index ca7c2b3..d3ea6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-advantage-tools (27.13.5~23.04.1) lunar; urgency=medium
+
+  * d/ubuntu-advantage-tools.postinst:
+    - fix version for cleaning the esm-apps stale unauthenticated files
+      (LP: #2006765)
+
+ -- Renan Rodrigo <[e-mail]>  Thu, 09 Feb 2023 14:20:47 -0300
+
 ubuntu-advantage-tools (27.13.4~23.04.1) lunar; urgency=medium
 
   * d/ubuntu-advantage-tools.postinst:
diff --git a/debian/ubuntu-advantage-tools.postinst b/debian/ubuntu-advantage-tools.postinst
index 8685602..5551478 100644
--- a/debian/ubuntu-advantage-tools.postinst
+++ b/debian/ubuntu-advantage-tools.postinst
@@ -378,7 +378,7 @@ case "$1" in
         fi
       fi
 
-      if dpkg --compare-versions "$PREVIOUS_PKG_VER" lt "27.13.3~"; then
+      if dpkg --compare-versions "$PREVIOUS_PKG_VER" lt "27.13.5~"; then
           # esm-apps unauthenticated ESM should not be in any release
           esm_apps_cleanup
       fi
diff --git a/sru/release-27.13.4/test-no-esm-apps-duplicates-attached.sh b/sru/release-27.13.5/test-no-esm-apps-duplicates-attached.sh
similarity index 100%
rename from sru/release-27.13.4/test-no-esm-apps-duplicates-attached.sh
rename to sru/release-27.13.5/test-no-esm-apps-duplicates-attached.sh
diff --git a/sru/release-27.13.4/test-no-esm-apps-duplicates.sh b/sru/release-27.13.5/test-no-esm-apps-duplicates.sh
similarity index 98%
rename from sru/release-27.13.4/test-no-esm-apps-duplicates.sh
rename to sru/release-27.13.5/test-no-esm-apps-duplicates.sh
index 2d2e2ba..2a7282c 100755
--- a/sru/release-27.13.4/test-no-esm-apps-duplicates.sh
+++ b/sru/release-27.13.5/test-no-esm-apps-duplicates.sh
@@ -74,9 +74,11 @@ echo -e "###########################################\n"
 # ----------------------------------------------------------------
 if [ $install_from == 'staging' ]; then
   lxc exec $name -- sudo add-apt-repository ppa:ua-client/staging -y > /dev/null
+  lxc exec $name -- apt-get update > /dev/null
   lxc exec $name -- apt-get install ubuntu-advantage-tools -y > /dev/null
 elif [ $install_from == 'proposed' ]; then
   lxc exec $name -- sh -c "echo \"deb http://archive.ubuntu.com/ubuntu $series-proposed main\" | tee /etc/apt/sources.list.d/proposed.list"
+  lxc exec $name -- apt-get update > /dev/null
   lxc exec $name -- apt-get install ubuntu-advantage-tools -y > /dev/null
 else
   lxc file push $install_from $name/new-ua.deb
diff --git a/uaclient/version.py b/uaclient/version.py
index 081c3b6..011d672 100644
--- a/uaclient/version.py
+++ b/uaclient/version.py
@@ -15,7 +15,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH
 from uaclient.exceptions import ProcessExecutionError
 from uaclient.system import subp
 
-__VERSION__ = "27.13.4"
+__VERSION__ = "27.13.5"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
 
 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"