autopkgtest-cloud

Merge ~paride/autopkgtest-cloud:suppoted-esm into autopkgtest-cloud:master

  1. Git
  2. lp:~paride/autopkgtest-cloud
  3. suppoted-esm
  4. Merge into master
Proposed by Paride Legovini
Status: Merged
Merged at revision: 40d82fc8d9bb33eb2abd52fe5814b06936f11566
Proposed branch: ~paride/autopkgtest-cloud:suppoted-esm
Merge into: autopkgtest-cloud:master
Diff against target: 57 lines (+5/-5)
3 files modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd-cluster-template.userdata.in.unused (+2/-2)
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata (+2/-2)
lxc-slave-admin/setup-adt-lxc.commands (+1/-1)
Reviewer Review Type Date Requested Status
Brian Murray Pending
Ubuntu Release Team Pending
Review via email: mp+427725@code.launchpad.net

Commit message

Create images for all supported releases (esm and non-esm)

Description of the change

Copypasting description for https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/427329 (superseded by this MP).

---

This explains why when we create new lxd-armhf workers the autopkgtest-lxd-worker (controller) will end up disabling their service - it can happen when a xenial test is sent to a worker and the image doesn't exist.

ubuntu@lxd-armhf4:~$ distro-info --supported
bionic
focal
jammy
kinetic
ubuntu@lxd-armhf4:~$ distro-info --supported-esm
trusty
xenial
bionic
focal
jammy

To post a comment you must log in.

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-cluster-template.userdata.in.unused b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd-cluster-template.userdata.in.unused
2index 77df329..20cbac3 100644
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd-cluster-template.userdata.in.unused
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd-cluster-template.userdata.in.unused
5@@ -51,7 +51,7 @@ write_files:
6 # development release
7 37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf
8 # stable releases
9- 1 0 * * 0 for r in $(distro-info --supported | grep -v $(distro-info --devel)); do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
10+ 1 0 * * 0 for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v $(distro-info --devel)); do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
11 {%- endif %}
12
13 - path: /var/tmp/setup/lxd-init
14@@ -121,7 +121,7 @@ write_files:
15 systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
16 python3 -c "from jinja2 import Template; import netifaces as ni; ni.ifaddresses('eth0'); ip = ni.ifaddresses('eth0')[ni.AF_INET][0]['addr']; f = open('/var/tmp/setup/lxd-init'); print(Template(f.read()).render(myip=ip))" | lxd init --preseed
17 {%- if role == 'bootstrap' or role == 'leader' %}
18- for r in $(distro-info --supported); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
19+ for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
20 {%- endif %}
21 echo "Finished building - rebooting so changed kernel command line comes into effect..."
22 reboot
23diff --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
24index b05bc6e..03f1fc6 100644
25--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
26+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
27@@ -48,7 +48,7 @@ write_files:
28 # development release
29 37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf
30 # stable releases
31- 1 0 * * 0 for r in $(distro-info --supported | grep -v $(distro-info --devel)); do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
32+ 1 0 * * 0 for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v $(distro-info --devel)); do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
33
34 - path: /var/tmp/setup/lxd-init
35 content: |
36@@ -100,7 +100,7 @@ write_files:
37 systemctl stop snap.lxd.daemon.unix.socket snap.lxd.daemon.service || true
38 systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
39 lxd init --preseed < /var/tmp/setup/lxd-init
40- for r in $(distro-info --supported); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
41+ for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
42 echo "Finished building - rebooting so changed kernel command line comes into effect..."
43 reboot
44
45diff --git a/lxc-slave-admin/setup-adt-lxc.commands b/lxc-slave-admin/setup-adt-lxc.commands
46index 1ffc100..f0a6c42 100644
47--- a/lxc-slave-admin/setup-adt-lxc.commands
48+++ b/lxc-slave-admin/setup-adt-lxc.commands
49@@ -6,7 +6,7 @@ sudo apt-get update
50 sudo apt-get install -y distro-info
51
52 LXCPATH=/data/lxc
53-RELEASES=$(distro-info --supported)
54+RELEASES=$({ distro-info --supported; distro-info --supported-esm; } | sort -u)
55 ARCH=$(dpkg --print-architecture)
56 if [ "$ARCH" = s390x ]; then
57 RELEASES=$(echo "$RELEASES" | grep -Ev 'precise|trusty')

Subscribers

People subscribed via source and target branches