Merge autopkgtest-cloud:lxd-no-trusty into autopkgtest-cloud:master

[Brian Murray]

There are no trusty images available so the jobs would fail if they try to use trusty.

https://us.lxd.images.canonical.com/

[Olivier Gayot (ogayot)]

LGTM!

One suggestion that you can apply if you feel like it:

Suggestion - replacing:

[...] | grep -v $(distro-info --devel)\|trusty

with

[...] | grep -v -F -e "$(distro-info --devel)" -e trusty

IMO this is easier to read but it might not be very objective :)

review: Approve

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 20cbac3..d60806d 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; 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
+     1 0 * * 0 for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v "$(distro-info --devel)\|trusty"); 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; distro-info --supported-esm; } | sort -u); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
+     for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v trusty); 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 03f1fc6..38d33ce 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; 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
+     1 0 * * 0 for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v "$(distro-info --devel)\|trusty"); 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; distro-info --supported-esm; } | sort -u); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
+     for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v trusty); 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 f0a6c42..337027b 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; distro-info --supported-esm; } | sort -u)
+RELEASES=$({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v trusty)
 ARCH=$(dpkg --print-architecture)
 if [ "$ARCH" = s390x ]; then
     RELEASES=$(echo "$RELEASES" | grep -Ev 'precise|trusty')