Merge ~paride/autopkgtest-cloud:userdata-new-cycle into autopkgtest-cloud:master

Proposed by Paride Legovini
Status: Merged
Merged at revision: 363828f7cedea90c4e09561abb11898ad543d0b0
Proposed branch: ~paride/autopkgtest-cloud:userdata-new-cycle
Merge into: autopkgtest-cloud:master
Diff against target: 19 lines (+7/-1)
1 file modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata (+7/-1)
Reviewer Review Type Date Requested Status
Brian Murray Approve
Ubuntu Release Team Pending
Review via email: mp+432644@code.launchpad.net

Commit message

armhf: handle case where devel release images are missing

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

Does autopkgtest-build-lxd-ubuntu do some magic with the $RELEASE variable e.g. editing /etc/apt/sources.list?

review: Needs Information
Revision history for this message
Brian Murray (brian-murray) :
review: Approve
Revision history for this message
Paride Legovini (paride) wrote :

Updated reference in comment as discussed in side channel.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
2index e64eb8f..440b2e4 100644
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
5@@ -100,7 +100,13 @@ write_files:
6 systemctl stop snap.lxd.daemon.unix.socket snap.lxd.daemon.service || true
7 systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
8 lxd init --preseed < /var/tmp/setup/lxd-init
9- /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd ubuntu-daily:$(distro-info --devel)/armhf
10+ if lxc image info ubuntu-daily:$(distro-info --devel)/armhf >/dev/null 2>&1; then
11+ /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd ubuntu-daily:$(distro-info --devel)/armhf
12+ else
13+ # if image for the devel release does not exist then take the latest stable release and upgrade it.
14+ # see autopkgtest-build-lxd(1) on what the RELEASE environment variable does.
15+ MIRROR=http://ftpmaster.internal/ubuntu/ RELEASE=$(distro-info --devel) /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd ubuntu:$(distro-info --stable)/armhf
16+ fi
17 for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v "$(distro-info --devel)\|trusty"); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd ubuntu:$r/armhf; done
18 echo "Finished building - rebooting so changed kernel command line comes into effect..."
19 reboot

Subscribers

People subscribed via source and target branches