Merge autopkgtest-cloud:suppoted-esm into autopkgtest-cloud:master

[Brian Murray]

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

[Brian Murray (brian-murray)]

We might not actually need the trusty images - I need to confirm with security.

[Brian Murray (brian-murray)]

Actually (again) this won't work because interim releases don't show up with "--supported-esm".

[ 3:25PM 10661 ] [ bdmurray@impulse:/srv/vms ]
 $ faketime '2022-07-01 00:00:00' distro-info --supported
bionic
focal
impish
jammy
kinetic
[ 3:26PM 10662 ] [ bdmurray@impulse:/srv/vms ]
 $ faketime '2022-07-01 00:00:00' distro-info --supported-esm
trusty
xenial
bionic
focal
jammy

[Paride Legovini (paride)]

I can't push on top of the suppoted-esm branch; I'm going to create a separate MP.

[Brian Murray (brian-murray)]

This was rejected in favor of Paride's branch.

Unmerged commits

f69c1f9... by Brian Murray on 2022-07-22

Create images for trusty and xenial too

diff --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
index 77df329..b634f5c 100644
--- 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
@@ -51,7 +51,7 @@ write_files:
      # development release
      37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf
      # stable releases
-     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
+     1 0 * * 0 for r in $(distro-info --supported-esm | grep -v $(distro-info --devel)); do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
 {%- endif %}
 
  - path: /var/tmp/setup/lxd-init
@@ -121,7 +121,7 @@ write_files:
      systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
      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
 {%- if role == 'bootstrap' or role == 'leader' %}
-     for r in $(distro-info --supported); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
+     for r in $(distro-info --supported-esm); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
 {%- endif %}
      echo "Finished building - rebooting so changed kernel command line comes into effect..."
      reboot
diff --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
index b05bc6e..2be3617 100644
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
@@ -48,7 +48,7 @@ write_files:
      # development release
      37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf
      # stable releases
-     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
+     1 0 * * 0 for r in $(distro-info --supported-esm | grep -v $(distro-info --devel)); do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
 
  - path: /var/tmp/setup/lxd-init
    content: |
@@ -100,7 +100,7 @@ write_files:
      systemctl stop snap.lxd.daemon.unix.socket snap.lxd.daemon.service || true
      systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
      lxd init --preseed < /var/tmp/setup/lxd-init
-     for r in $(distro-info --supported); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
+     for r in $(distro-info --supported-esm); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
      echo "Finished building - rebooting so changed kernel command line comes into effect..."
      reboot
 
diff --git a/lxc-slave-admin/setup-adt-lxc.commands b/lxc-slave-admin/setup-adt-lxc.commands
index 1ffc100..3067578 100644
--- a/lxc-slave-admin/setup-adt-lxc.commands
+++ b/lxc-slave-admin/setup-adt-lxc.commands
@@ -6,7 +6,7 @@ sudo apt-get update
 sudo apt-get install -y distro-info
 
 LXCPATH=/data/lxc
-RELEASES=$(distro-info --supported)
+RELEASES=$(distro-info --supported-esm)
 ARCH=$(dpkg --print-architecture)
 if [ "$ARCH" = s390x ]; then
     RELEASES=$(echo "$RELEASES" | grep -Ev 'precise|trusty')