Merge pull request #483 from simondeziel/eol

Drop Ubuntu 14.04 and 16.04
lxc · Jul 7, 2021 · 21243e1 · 21243e1
2 parents c056c9f + dc07b83
commit 21243e1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 82 deletions.
diff --git a/doc/examples/scheme.yaml b/doc/examples/scheme.yaml
@@ -19,7 +19,7 @@ source:
   keyserver: http://keyserver.ubuntu.com
   variant: default
   suite: suite
-  same_as: xenial
+  same_as: bionic
   skip_verification: false
 
 targets:
@@ -46,21 +46,11 @@ targets:
         content: |-
           lxc.include = LXC_TEMPLATE_CONFIG/common.conf
 
-          # For Ubuntu 14.04
-          lxc.mount.entry = /sys/kernel/debug sys/kernel/debug none bind,optional 0 0
-          lxc.mount.entry = /sys/kernel/security sys/kernel/security none bind,optional 0 0
-          lxc.mount.entry = /sys/fs/pstore sys/fs/pstore none bind,optional 0 0
-          lxc.mount.entry = mqueue dev/mqueue mqueue rw,relatime,create=dir,optional 0 0
-
       - type: user
         after: 4
         content: |-
           lxc.include = LXC_TEMPLATE_CONFIG/userns.conf
 
-          # For Ubuntu 14.04
-          lxc.mount.entry = /sys/firmware/efi/efivars sys/firmware/efi/efivars none bind,optional 0 0
-          lxc.mount.entry = /proc/sys/fs/binfmt_misc proc/sys/fs/binfmt_misc none bind,optional 0 0
-
       - type: all
         content: |-
           lxc.arch = {{ image.architecture_personality }}

diff --git a/doc/examples/ubuntu.yaml b/doc/examples/ubuntu.yaml
@@ -38,21 +38,11 @@ targets:
       content: |-
         lxc.include = LXC_TEMPLATE_CONFIG/common.conf
 
-        # For Ubuntu 14.04
-        lxc.mount.entry = /sys/kernel/debug sys/kernel/debug none bind,optional 0 0
-        lxc.mount.entry = /sys/kernel/security sys/kernel/security none bind,optional 0 0
-        lxc.mount.entry = /sys/fs/pstore sys/fs/pstore none bind,optional 0 0
-        lxc.mount.entry = mqueue dev/mqueue mqueue rw,relatime,create=dir,optional 0 0
-
     - type: user
       after: 4
       content: |-
         lxc.include = LXC_TEMPLATE_CONFIG/userns.conf
 
-        # For Ubuntu 14.04
-        lxc.mount.entry = /sys/firmware/efi/efivars sys/firmware/efi/efivars none bind,optional 0 0
-        lxc.mount.entry = /proc/sys/fs/binfmt_misc proc/sys/fs/binfmt_misc none bind,optional 0 0
-
     - type: all
       content: |-
         lxc.arch = {{ image.architecture_personality }}
@@ -99,26 +89,6 @@ files:
   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:
-  - trusty
-  - xenial
-  types:
-  - container
-
 - path: /etc/netplan/10-lxc.yaml
   generator: dump
   content: |-
@@ -138,33 +108,6 @@ files:
   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 enp5s0
-    iface enp5s0 inet dhcp
-
-    source /etc/network/interfaces.d/*.cfg
-  releases:
-  - trusty
-  - xenial
-  types:
-  - vm
-
-- path: /etc/init/lxc-tty.conf
-  generator: upstart-tty
-  releases:
-  - trusty
-  types:
-  - container
-
 - name: meta-data
   generator: cloud-init
   variants:
@@ -271,14 +214,6 @@ packages:
     types:
     - vm
 
-  - packages:
-    - linux-virtual-hwe-16.04
-    action: install
-    releases:
-    - xenial
-    types:
-    - vm
-
   - packages:
     - linux-virtual
     action: install

diff --git a/sources/ubuntu-http.go b/sources/ubuntu-http.go
@@ -131,11 +131,7 @@ func (s *ubuntu) runCoreVariant(definition shared.Definition, rootfsDir string)
 		}
 	}
 
-	baseDistro := "xenial"
-
-	if s.definition.Image.Release == "18" {
-		baseDistro = "bionic"
-	}
+	baseDistro := "bionic"
 
 	// Download the base Ubuntu image
 	coreImage, err := getLatestCoreBaseImage("https://images.linuxcontainers.org/images", baseDistro, s.definition.Image.ArchitectureMapped)

diff --git a/sources/ubuntu-http_test.go b/sources/ubuntu-http_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestUbuntuGetLatestCoreBaseImage(t *testing.T) {
-	release, err := getLatestCoreBaseImage("https://images.linuxcontainers.org/images", "xenial", "amd64")
+	release, err := getLatestCoreBaseImage("https://images.linuxcontainers.org/images", "bionic", "amd64")
 	require.NoError(t, err)
 	require.NotEmpty(t, release)
 }