Merge lp:~paride/auto-upgrade-testing/lts-to-lts into lp:auto-upgrade-testing

[Paride Legovini]

upgrade: allow LTS-to-LTS upgrades if available

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:100
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/53/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-amd64-package/11/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-i386-package/10/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2503/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/53/rebuild

review: Needs Fixing (continuous-integration)

[Paride Legovini (paride)]

woohoo, we have (broken) CI in here! Let's see if I can fix it.

[Brian Murray (brian-murray)]

This looks good to me other than one typo.

review: Approve

[lp:~paride/auto-upgrade-testing/lts-to-lts]

101. By Paride Legovini on 2022-07-07

Fixup indentation

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:101
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/54/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-amd64-package/12/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-i386-package/11/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2504/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/54/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/tests/upgrade'
--- debian/tests/upgrade	2019-05-16 16:22:22 +0000
+++ debian/tests/upgrade	2022-07-07 13:33:33 +0000
@@ -372,14 +372,20 @@
     export DEBIAN_FRONTEND=noninteractive
     # Ensure we have do-release-upgrade
     apt-get update
-    apt-get dist-upgrade -y
-    apt-get -y --force-yes install distro-info openssh-server update-manager-core
-    # Allow upgrade from lts to non-lts
-    if [ $(lsb_release -sc) == $(distro-info --lts) ] ; then
-        sed 's/Prompt=lts/Prompt=normal/' -i /etc/update-manager/release-upgrades
+    apt-get -y dist-upgrade
+    apt-get -y install openssh-server update-manager-core
+
+    # Allow upgrade from lts to non-lts if there's not lts to upgrade to
+    local version
+    if grep '^Prompt=lts' /etc/update-manager/release-upgrades; then
+        version=$(do-release-upgrade -d -p -c | awk '/New release/ {print $3}' | tr -d \')
+        if [ -z "${version}" ]; then
+            # No LTS release to upgrade to. Enable non-LTS upgrades.
+            sed -i 's/Prompt=lts/Prompt=normal/' /etc/update-manager/release-upgrades
+        fi
     fi
 
-    local version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')
+    version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')
     if [ -z "${version}" ]; then
         do-release-upgrade -d -f DistUpgradeViewNonInteractive
     else

=== modified file 'upgrade_testing/provisioning/backends/_qemu.py'
--- upgrade_testing/provisioning/backends/_qemu.py	2019-11-26 07:48:05 +0000
+++ upgrade_testing/provisioning/backends/_qemu.py	2022-07-07 13:33:33 +0000
@@ -66,6 +66,7 @@
 )
 DEFAULT_RAM = '2048'
 DEFAULT_CPU = '2'
+TIMEOUT_REBOOT = '300'
 HEADLESS = True
 
 logger = logging.getLogger(__name__)
@@ -161,6 +162,7 @@
             super().connect()
             return super().get_adt_run_args()
         return ['qemu', '-c', DEFAULT_CPU, '--ram-size', DEFAULT_RAM,
+                '--timeout-reboot', TIMEOUT_REBOOT,
                 os.path.join(CACHE_DIR, self.image_name)]
 
     def create_overlay_image(self, overlay_img):