Merge pull request #223 from simondeziel/debian10-eol

Debian 10/Buster (EOL: 2024-06-30)
canonical · Jul 2, 2024 · 03ed5a8 · 03ed5a8
2 parents 0ec71be + 8640adf
commit 03ed5a8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 120 deletions.
diff --git a/.github/workflows/image-debian.yml b/.github/workflows/image-debian.yml
@@ -22,7 +22,6 @@ jobs:
       fail-fast: false
       matrix:
         release:
-          - buster
           - bullseye
           - sid
           - bookworm

diff --git a/images/debian.yaml b/images/debian.yaml
@@ -3,7 +3,6 @@ image:
 
 simplestream:
   release_aliases:
-    buster: 10
     bullseye: 11
     bookworm: 12
     trixie: 13
@@ -1004,65 +1003,6 @@ files:
 - path: /var/lib/dbus/machine-id
   generator: remove
 
-- 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/*
-  types:
-  - container
-  variants:
-  - default
-  releases:
-  - buster
-
-- 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/*
-  types:
-  - vm
-  releases:
-  - buster
-
-- 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
-
-    source /etc/network/interfaces.d/*
-  types:
-  - container
-  - vm
-  variants:
-  - cloud
-  releases:
-  - buster
-
 - path: /etc/systemd/network/eth0.network
   generator: dump
   content: |-
@@ -1079,11 +1019,6 @@ files:
     ClientIdentifier=mac
   types:
   - container
-  releases:
-  - bullseye
-  - bookworm
-  - sid
-  - trixie
 
 - path: /etc/systemd/network/enp5s0.network
   generator: dump
@@ -1103,11 +1038,6 @@ files:
   - vm
   variants:
   - default
-  releases:
-  - bullseye
-  - bookworm
-  - sid
-  - trixie
 
 - path: /etc/default/grub.d/50-lxd.cfg
   generator: dump
@@ -1182,20 +1112,9 @@ packages:
     - vim
     action: install
 
-  - packages:
-    - ifupdown
-    action: install
-    releases:
-    - buster
-
   - packages:
     - udev
     action: install
-    releases:
-    - bullseye
-    - bookworm
-    - sid
-    - trixie
 
   - packages:
     - dbus
@@ -1220,7 +1139,6 @@ packages:
     variants:
     - cloud
     releases:
-    - buster
     - bullseye
 
   - packages:
@@ -1247,12 +1165,6 @@ packages:
     - vm
     architectures:
     - amd64
-    releases:
-    - buster
-    - bullseye
-    - sid
-    - bookworm
-    - trixie
 
   - packages:
     - grub-efi-arm64
@@ -1268,20 +1180,13 @@ packages:
     action: install
     types:
     - vm
-    releases:
-    - buster
-    - bullseye
-    - sid
-    - bookworm
-    - trixie
 
   repositories:
   - name: sources.list
     url: |-
       deb http://deb.debian.org/debian {{ image.release }} main
       {% if image.release != "sid" %}deb http://deb.debian.org/debian {{ image.release }}-updates main{% endif %}
-      {% if image.release != "sid" and image.release != "buster" %}deb http://deb.debian.org/debian-security/ {{ image.release }}-security main{% endif %}
-      {% if image.release == "buster" %}deb http://deb.debian.org/debian-security/ {{ image.release }}/updates main{% endif %}
+      {% if image.release != "sid" %}deb http://deb.debian.org/debian-security/ {{ image.release }}-security main{% endif %}
     architectures:
     - amd64
     - arm64
@@ -1309,18 +1214,6 @@ actions:
   variants:
   - cloud
 
-- trigger: post-packages
-  action: |-
-    #!/bin/sh
-    set -eux
-
-    # Disable networkd (unused)
-    systemctl mask systemd-networkd.service
-    systemctl mask systemd-networkd.socket
-    systemctl mask systemd-networkd-wait-online.service
-  releases:
-  - buster
-
 - trigger: post-packages
   action: |-
     #!/bin/sh
@@ -1376,11 +1269,6 @@ actions:
   - vm
   variants:
   - default
-  releases:
-  - bullseye
-  - bookworm
-  - sid
-  - trixie
 
 - trigger: post-packages
   action: |-
@@ -1486,12 +1374,6 @@ actions:
     sed -i "s#root=[^ ]*#root=/dev/sda2#g" /boot/grub/grub.cfg
   types:
   - vm
-  releases:
-  - buster
-  - bullseye
-  - sid
-  - bookworm
-  - trixie
 
 - trigger: post-files
   action: |-