Merge pull request #203 from simondeziel/ubuntu-update

Update Ubuntu workflow/image

.github/workflows/image-ubuntu.yml

@@ -17,8 +17,6 @@ jobs:
       fail-fast: false
       matrix:
         release:
-          # - xenial
-          # - bionic
           - focal
           - jammy
           - mantic
@@ -31,8 +29,6 @@ jobs:
           - amd64
           # - arm64
         exclude:
-          - {variant: desktop, release: bionic}
-          - {variant: desktop, release: xenial}
           - {variant: desktop, architecture: arm64}
 
     env:

images/ubuntu.yaml

@@ -3,17 +3,11 @@ image:
 
 simplestream:
   release_aliases:
-    # xenial: 16.04
-    # bionic: 18.04
     focal: 20.04
     jammy: 22.04
     mantic: 23.10
     noble: 24.04
   requirements:
-  # - requirements:
-  #     cgroup: v1
-  #   releases:
-  #   - xenial
   - requirements:
       cgroup: v2
     releases:
@@ -357,36 +351,11 @@ files:
         eth0:
           dhcp4: true
           dhcp-identifier: mac
-  releases:
-  - bionic
-  - focal
-  - jammy
-  - mantic
-  - noble
   types:
   - container
   variants:
   - default
 
-- path: /etc/network/interfaces
-  generator: dump
-  content: |-
-    # This file describes the network interfaces available on your system
-    # and how to activate them. For more information, see interfaces(5).
-
-    # The loopback network interface
-    auto lo
-    iface lo inet loopback
-
-    auto eth0
-    iface eth0 inet dhcp
-
-    source /etc/network/interfaces.d/*.cfg
-  releases:
-  - xenial
-  types:
-  - container
-
 - path: /etc/netplan/10-lxc.yaml
   generator: dump
   mode: 0600
@@ -397,37 +366,12 @@ files:
         enp5s0:
           dhcp4: true
           dhcp-identifier: mac
-  releases:
-  - bionic
-  - focal
-  - jammy
-  - mantic
-  - noble
   types:
   - vm
   variants:
   - default
   - desktop
 
-- path: /etc/network/interfaces
-  generator: dump
-  content: |-
-    # This file describes the network interfaces available on your system
-    # and how to activate them. For more information, see interfaces(5).
-
-    # The loopback network interface
-    auto lo
-    iface lo inet loopback
-
-    auto enp5s0
-    iface enp5s0 inet dhcp
-
-    source /etc/network/interfaces.d/*.cfg
-  releases:
-  - xenial
-  types:
-  - vm
-
 - name: meta-data
   generator: cloud-init
   variants:
@@ -496,8 +440,6 @@ packages:
   - packages:
     - fuse
     releases:
-    - xenial
-    - bionic
     - focal
     action: install
 
@@ -531,8 +473,6 @@ packages:
     architectures:
     - ppc64el
     releases:
-    - xenial
-    - bionic
     - jammy
     - mantic
     - noble
@@ -550,17 +490,6 @@ packages:
     - mantic
     - noble
 
-  - packages:
-    - acpid
-    action: install
-    architectures:
-    - amd64
-    - arm64
-    releases:
-    - xenial
-    types:
-    - vm
-
   - packages:
     - grub-efi-amd64-signed
     - shim-signed
@@ -583,31 +512,12 @@ packages:
     action: install
     architectures:
     - arm64
-    releases:
-    - focal
-    - jammy
-    - mantic
-    - noble
-    types:
-    - vm
-
-  - packages:
-    - linux-image-virtual-hwe-16.04
-    action: install
-    releases:
-    - xenial
     types:
     - vm
 
   - packages:
     - linux-image-virtual
     action: install
-    releases:
-    - bionic
-    - focal
-    - jammy
-    - mantic
-    - noble
     types:
     - vm
 
@@ -684,7 +594,6 @@ actions:
     # Enable systemd-networkd
     systemctl enable systemd-networkd
   releases:
-  - bionic
   - focal
   - jammy
   - mantic
@@ -782,12 +691,11 @@ actions:
     echo LANG=en_US.UTF-8 > /etc/locale.conf
 
     # User
-    USERNAME="ubuntu"
-    useradd ${USERNAME} -s /bin/bash -m -U -G adm,video,users
+    useradd ubuntu -s /bin/bash -m -U -G adm,video,users
 
     cat << EOF > /etc/gdm3/custom.conf
     [daemon]
-    AutomaticLogin=${USERNAME}
+    AutomaticLogin=ubuntu
     AutomaticLoginEnable=true
     EOF