Sync image definitions with lxc-ci

images/alpine.yaml

@@ -328,6 +328,7 @@ packages:
     releases:
     - 3.17
     - 3.18
+    - 3.19
     - edge
 
   - packages:
@@ -405,6 +406,9 @@ actions:
     for svc_name in sshd; do
         ln -fs /etc/init.d/${svc_name} /etc/runlevels/default/${svc_name}
     done
+
+    # Tweak to prevent cloud-init from getting stuck.
+    echo "datasource_list: ['NoCloud', 'ConfigDrive', 'LXD', 'None']" > /etc/cloud/cloud.cfg.d/99_lxc.cfg
   types:
   - vm
   variants:

images/alt.yaml

@@ -92,6 +92,9 @@ files:
 
     [Network]
     DHCP=ipv4
+
+    [DHCP]
+    ClientIdentifier=mac
   variants:
   - default
 

images/amazonlinux.yaml

@@ -55,6 +55,8 @@ files:
     [Network]
     DHCP=ipv4
 
+    [DHCP]
+    ClientIdentifier=mac
 - path: /etc/fstab
   generator: dump
 

images/apertis.yaml

@@ -2,7 +2,7 @@ image:
   distribution: Apertis
   description: |-
     Apertis {{ image.architecture }} {{ image.variant }} {{ image.release }} {{ image.serial }}
-  variant: minimal
+  variant: sysroot
 
 source:
   downloader: apertis-http
@@ -61,6 +61,8 @@ files:
     [Network]
     DHCP=ipv4
 
+    [DHCP]
+    ClientIdentifier=mac
 packages:
   manager: apt
   update: true

images/archlinux.yaml

@@ -482,6 +482,9 @@ files:
 
     [Network]
     DHCP=ipv4
+
+    [DHCP]
+    ClientIdentifier=mac
   types:
   - container
 
@@ -494,6 +497,9 @@ files:
 
     [Network]
     DHCP=ipv4
+
+    [DHCP]
+    ClientIdentifier=mac
   types:
   - vm
 
@@ -730,6 +736,9 @@ actions:
     # Enable GDM
     systemctl enable gdm
 
+    # Disable colord
+    systemctl mask colord
+
     cat << EOF > /home/archlinux/firstboot.sh
     #!/bin/sh
 
@@ -744,6 +753,9 @@ actions:
     # Disable 60-second logout prompt when `lxc stop` is called.
     gsettings set org.gnome.SessionManager logout-prompt false
 
+    # Disable welcome tour.
+    gsettings set org.gnome.shell welcome-dialog-last-shown-version '4294967295'
+
     # Delete this script
     rm /home/archlinux/firstboot.sh
     EOF

images/centos.yaml

@@ -496,7 +496,7 @@ files:
   - 8-Stream
 
 packages:
-  manager: yum
+  manager: dnf
   update: true
   cleanup: true
   sets:
@@ -742,7 +742,7 @@ actions:
     cat << "EOF" > /etc/yum.repos.d/centos.repo
     [baseos]
     name=CentOS Stream $releasever - BaseOS
-    baseurl=https://mirror.xenyth.net/centos-stream/$stream/BaseOS/$basearch/os/
+    baseurl=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream/$stream/BaseOS/$basearch/os/
     gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
     gpgcheck=1
     repo_gpgcheck=0
@@ -752,7 +752,7 @@ actions:
 
     [appstream]
     name=CentOS Stream $releasever - AppStream
-    baseurl=https://mirror.xenyth.net/centos-stream/$stream/AppStream/$basearch/os/
+    baseurl=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream/$stream/AppStream/$basearch/os/
     metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$stream&arch=$basearch&protocol=https,http
     gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
     gpgcheck=1
@@ -765,7 +765,7 @@ actions:
     cat << "EOF" > /etc/yum.repos.d/centos-addons.repo
     [extras-common]
     name=CentOS Stream $releasever - Extras packages
-    baseurl=https://mirror.xenyth.net/centos-stream/SIGs/$stream/extras/$basearch/extras-common
+    baseurl=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream/SIGs/$stream/extras/$basearch/extras-common
     gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512
     gpgcheck=1
     repo_gpgcheck=0

images/debian.yaml

@@ -1061,26 +1061,37 @@ files:
   content: |-
     [Match]
     Name=eth0
+
     [Network]
     DHCP=true
+
     [DHCPv4]
     UseDomains=true
+
+    [DHCP]
+    ClientIdentifier=mac
   types:
   - container
   releases:
   - bullseye
   - bookworm
   - sid
+  - trixie
 
 - path: /etc/systemd/network/enp5s0.network
   generator: dump
   content: |-
     [Match]
     Name=enp5s0
+
     [Network]
     DHCP=true
+
     [DHCPv4]
     UseDomains=true
+
+    [DHCP]
+    ClientIdentifier=mac
   types:
   - vm
   variants:
@@ -1089,6 +1100,7 @@ files:
   - bullseye
   - bookworm
   - sid
+  - trixie
 
 - path: /etc/default/grub.d/50-lxd.cfg
   generator: dump
@@ -1176,6 +1188,7 @@ packages:
     - bullseye
     - bookworm
     - sid
+    - trixie
 
   - packages:
     - dbus
@@ -1185,6 +1198,7 @@ packages:
     releases:
     - bookworm
     - sid
+    - trixie
 
   - packages:
     - cloud-init
@@ -1231,6 +1245,7 @@ packages:
     - bullseye
     - sid
     - bookworm
+    - trixie
 
   - packages:
     - grub-efi-arm64
@@ -1251,6 +1266,7 @@ packages:
     - bullseye
     - sid
     - bookworm
+    - trixie
 
   repositories:
   - name: sources.list
@@ -1269,8 +1285,7 @@ packages:
     - s390x
   - name: sources.list
     url: |-
-      deb http://ftp.ports.debian.org/debian-ports unstable main
-      deb http://ftp.ports.debian.org/debian-ports unreleased main
+      deb http://deb.debian.org/debian sid main
     architectures:
     - riscv64
 
@@ -1341,6 +1356,7 @@ actions:
   releases:
   - bookworm
   - sid
+  - trixie
 
 - trigger: post-packages
   action: |-
@@ -1357,6 +1373,7 @@ actions:
   - bullseye
   - bookworm
   - sid
+  - trixie
 
 - trigger: post-packages
   action: |-
@@ -1372,6 +1389,7 @@ actions:
   releases:
   - bookworm
   - sid
+  - trixie
 
 - trigger: post-packages
   action: |-
@@ -1397,6 +1415,7 @@ actions:
   releases:
   - bookworm
   - sid
+  - trixie
 
 - trigger: post-packages
   action: |-
@@ -1449,10 +1468,13 @@ actions:
     [ "$(uname -m)" = "aarch64" ] && TARGET="arm64"
 
     update-grub
+
     # This will create EFI/BOOT
     grub-install --uefi-secure-boot --target="${TARGET}-efi" --no-nvram --removable
+
     # This will create EFI/debian
     grub-install --uefi-secure-boot --target="${TARGET}-efi" --no-nvram
+
     update-grub
     sed -i "s#root=[^ ]*#root=/dev/sda2#g" /boot/grub/grub.cfg
   types:
@@ -1462,6 +1484,7 @@ actions:
   - bullseye
   - sid
   - bookworm
+  - trixie
 
 - trigger: post-files
   action: |-
@@ -1473,6 +1496,7 @@ actions:
   releases:
   - bookworm
   - sid
+  - trixie
 
 - trigger: post-files
   action: |-

images/fedora.yaml

@@ -92,6 +92,9 @@ files:
 
     [Network]
     DHCP=ipv4
+
+    [DHCP]
+    ClientIdentifier=mac
   variants:
   - default
   types:
@@ -106,6 +109,9 @@ files:
 
     [Network]
     DHCP=ipv4
+
+    [DHCP]
+    ClientIdentifier=mac
   variants:
   - default
   types:
@@ -221,6 +227,19 @@ packages:
     types:
     - vm
 
+  - packages:
+    - lvm2
+    - lvm2-libs
+    action: remove
+    types:
+    - vm
+
+  - packages:
+    - libsss_idmap
+    - libsss_nss_idmap
+    - sssd-client
+    action: remove
+
 actions:
 - trigger: post-unpack
   action: |-
@@ -249,7 +268,7 @@ actions:
     for repo in $(ls /etc/yum.repos.d/*.repo); do
       grep -q '^#baseurl' "${repo}" || continue
 
-      sed -ri 's/^metalink=.*/#\0/g;s@^#(baseurl=)http://download.example/pub(.*)@\1https://mirror.csclub.uwaterloo.ca/\2@g' "${repo}"
+      sed -ri 's/^metalink=.*/#\0/g;s@^#(baseurl=)http://download.example/pub(.*)@\1http://fedora.mirror.constant.com/\2@g' "${repo}"
     done
   architectures:
   - aarch64

images/funtoo.yaml

@@ -257,7 +257,7 @@ files:
 
 packages:
   manager: egoportage
-  update: false
+  update: true
   cleanup: true
   sets:
   - packages:
@@ -280,5 +280,12 @@ actions:
     rc-update add netif.eth0 default
     echo template=dhcpcd > /etc/conf.d/netif.eth0
 
+- trigger: post-packages
+  action: |-
+    #!/bin/bash
+    # Configure LXD/LXC tty
+    sed -e 's|^#x1|x1|g' -e '/^c[0-9].*/d' -i /etc/inittab
+
+
 mappings:
   architecture_map: funtoo