← Back to team overview

canonical-ubuntu-qa team mailing list archive

[Merge] ~hyask/autopkgtest-cloud:skia/userdata_kill_armhf into autopkgtest-cloud:master

 

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/userdata_kill_armhf into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/465144

Hardcoding releases for armhf remote, since armhf will now be killed.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/userdata_kill_armhf into autopkgtest-cloud:master.
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 6f5973b..1531d5c 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
@@ -44,10 +44,8 @@ write_files:
  - path: /var/tmp/setup/ubuntu-crontab
    content: |
      PATH=/snap/bin:/usr/bin:/bin
-     # development release
-     37 2 * * * MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd ubuntu-daily:$(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)\|trusty"); do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd ubuntu:$r/armhf; done
+     1 0 * * 0 for r in xenial bionic focal jammy mantic noble; do MIRROR=http://ftpmaster.internal/ubuntu/ ~/autopkgtest/tools/autopkgtest-build-lxd ubuntu:$r/armhf; done
 
  - path: /var/tmp/setup/lxd-init
    content: |
@@ -98,22 +96,12 @@ write_files:
      systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
      lxd init --preseed < /var/tmp/setup/lxd-init
      export MIRROR=http://ftpmaster.internal/ubuntu/
-     for r in $({ distro-info --supported; distro-info --supported-esm; } | sort -u | grep -v "$(distro-info --devel)\|trusty"); do
+     for r in xenial bionic focal jammy mantic noble; do
          command="/home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd ubuntu:$r/armhf"
          ( sleep 20; $command ) ||  \
             ( sleep 20; $command ) ||  \
             ( sleep 20; $command ) || echo "Failed building $r image, please do it manually with 'MIRROR=$MIRROR $command'"
      done
-     devel="$(distro-info --devel)"
-     if lxc image info ubuntu-daily:$devel/armhf >/dev/null 2>&1; then
-         command="/home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd ubuntu-daily:$devel/armhf"
-         $command || $command || $command || echo "Failed building $devel image, please do it manually with 'MIRROR=$MIRROR $command'"
-     else
-         # if image for the devel release does not exist then take the latest stable release and upgrade it.
-         # see autopkgtest-build-lxd(1) on what the RELEASE environment variable does.
-         command="RELEASE=$(distro-info --devel) /home/ubuntu/autopkgtest/tools/autopkgtest-build-lxd ubuntu:$(distro-info --stable)/armhf"
-         $command || $command || $command || echo "Failed building $devel image, please do it manually with 'MIRROR=$MIRROR $command'"
-     fi
      echo "Finished building - rebooting so changed kernel command line comes into effect..."
      reboot