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

Proposed by Brian Murray
Status: Rejected
Rejected by: Brian Murray
Proposed branch: 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
Ubuntu Release Team Pending
Review via email: mp+427329@code.launchpad.net

Description of the change

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.
Revision history for this message
Brian Murray (brian-murray) wrote :

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

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

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

Revision history for this message
Paride Legovini (paride) wrote :

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

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

This was rejected in favor of Paride's branch.

Unmerged commits

f69c1f9... by Brian Murray

Create images for trusty and xenial too

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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:
51 # development release51 # development release
52 37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf52 37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf
53 # stable releases53 # stable releases
54 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; done54 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
55{%- endif %}55{%- endif %}
5656
57 - path: /var/tmp/setup/lxd-init57 - path: /var/tmp/setup/lxd-init
@@ -121,7 +121,7 @@ write_files:
121 systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service121 systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
122 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 --preseed122 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
123{%- if role == 'bootstrap' or role == 'leader' %}123{%- if role == 'bootstrap' or role == 'leader' %}
124 for r in $(distro-info --supported); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done124 for r in $(distro-info --supported-esm); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
125{%- endif %}125{%- endif %}
126 echo "Finished building - rebooting so changed kernel command line comes into effect..."126 echo "Finished building - rebooting so changed kernel command line comes into effect..."
127 reboot127 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:
48 # development release48 # development release
49 37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf49 37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$(distro-info --devel)/armhf
50 # stable releases50 # stable releases
51 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; done51 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
5252
53 - path: /var/tmp/setup/lxd-init53 - path: /var/tmp/setup/lxd-init
54 content: |54 content: |
@@ -100,7 +100,7 @@ write_files:
100 systemctl stop snap.lxd.daemon.unix.socket snap.lxd.daemon.service || true100 systemctl stop snap.lxd.daemon.unix.socket snap.lxd.daemon.service || true
101 systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service101 systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
102 lxd init --preseed < /var/tmp/setup/lxd-init102 lxd init --preseed < /var/tmp/setup/lxd-init
103 for r in $(distro-info --supported); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done103 for r in $(distro-info --supported-esm); do /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd images:ubuntu/$r/armhf; done
104 echo "Finished building - rebooting so changed kernel command line comes into effect..."104 echo "Finished building - rebooting so changed kernel command line comes into effect..."
105 reboot105 reboot
106106
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
6sudo apt-get install -y distro-info6sudo apt-get install -y distro-info
77
8LXCPATH=/data/lxc8LXCPATH=/data/lxc
9RELEASES=$(distro-info --supported)9RELEASES=$(distro-info --supported-esm)
10ARCH=$(dpkg --print-architecture)10ARCH=$(dpkg --print-architecture)
11if [ "$ARCH" = s390x ]; then11if [ "$ARCH" = s390x ]; then
12 RELEASES=$(echo "$RELEASES" | grep -Ev 'precise|trusty')12 RELEASES=$(echo "$RELEASES" | grep -Ev 'precise|trusty')

Subscribers

People subscribed via source and target branches