Auto Upgrade Testing

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

  1. lts-to-lts
  2. Merge into autopkgtest
Proposed by Paride Legovini
Status: Merged
Merged at revision: 101
Proposed branch: lp:~paride/auto-upgrade-testing/lts-to-lts
Merge into: lp:auto-upgrade-testing
Diff against target: 50 lines (+14/-6)
2 files modified
debian/tests/upgrade (+12/-6)
upgrade_testing/provisioning/backends/_qemu.py (+2/-0)
To merge this branch: bzr merge lp:~paride/auto-upgrade-testing/lts-to-lts
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Needs Fixing
Brian Murray Approve
Review via email: mp+426194@code.launchpad.net

Commit message

upgrade: allow LTS-to-LTS upgrades if available

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :

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)
Revision history for this message
Paride Legovini (paride) wrote :

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

Revision history for this message
Brian Murray (brian-murray) wrote :

This looks good to me other than one typo.

review: Approve
lp:~paride/auto-upgrade-testing/lts-to-lts updated
101. By Paride Legovini

Fixup indentation

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
372 export DEBIAN_FRONTEND=noninteractive372 export DEBIAN_FRONTEND=noninteractive
373 # Ensure we have do-release-upgrade373 # Ensure we have do-release-upgrade
374 apt-get update374 apt-get update
375 apt-get dist-upgrade -y375 apt-get -y dist-upgrade
376 apt-get -y --force-yes install distro-info openssh-server update-manager-core376 apt-get -y install openssh-server update-manager-core
377 # Allow upgrade from lts to non-lts377
378 if [ $(lsb_release -sc) == $(distro-info --lts) ] ; then378 # Allow upgrade from lts to non-lts if there's not lts to upgrade to
379 sed 's/Prompt=lts/Prompt=normal/' -i /etc/update-manager/release-upgrades379 local version
380 if grep '^Prompt=lts' /etc/update-manager/release-upgrades; then
381 version=$(do-release-upgrade -d -p -c | awk '/New release/ {print $3}' | tr -d \')
382 if [ -z "${version}" ]; then
383 # No LTS release to upgrade to. Enable non-LTS upgrades.
384 sed -i 's/Prompt=lts/Prompt=normal/' /etc/update-manager/release-upgrades
385 fi
380 fi386 fi
381387
382 local version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')388 version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')
383 if [ -z "${version}" ]; then389 if [ -z "${version}" ]; then
384 do-release-upgrade -d -f DistUpgradeViewNonInteractive390 do-release-upgrade -d -f DistUpgradeViewNonInteractive
385 else391 else
386392
=== 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 @@
66)66)
67DEFAULT_RAM = '2048'67DEFAULT_RAM = '2048'
68DEFAULT_CPU = '2'68DEFAULT_CPU = '2'
69TIMEOUT_REBOOT = '300'
69HEADLESS = True70HEADLESS = True
7071
71logger = logging.getLogger(__name__)72logger = logging.getLogger(__name__)
@@ -161,6 +162,7 @@
161 super().connect()162 super().connect()
162 return super().get_adt_run_args()163 return super().get_adt_run_args()
163 return ['qemu', '-c', DEFAULT_CPU, '--ram-size', DEFAULT_RAM,164 return ['qemu', '-c', DEFAULT_CPU, '--ram-size', DEFAULT_RAM,
165 '--timeout-reboot', TIMEOUT_REBOOT,
164 os.path.join(CACHE_DIR, self.image_name)]166 os.path.join(CACHE_DIR, self.image_name)]
165167
166 def create_overlay_image(self, overlay_img):168 def create_overlay_image(self, overlay_img):

Subscribers

People subscribed via source and target branches