Drop Ubuntu Bionic support

electrocucaracha · Jan 17, 2025 · 9457527 · 9457527
1 parent 4b26f0f
commit 9457527
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 47 deletions.
diff --git a/.github/actions/vagrant-setup/action.yml b/.github/actions/vagrant-setup/action.yml
@@ -15,9 +15,9 @@ runs:
       uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 4.2.0
       with:
         path: ~/.vagrant.d/boxes
-        key: ${{ runner.os }}-vagrant-ubuntu-bionic-${{ hashFiles('distros_supported.yml') }}
+        key: ${{ runner.os }}-vagrant-boxes-${{ hashFiles('distros_supported.yml') }}
         restore-keys: |
-          ${{ runner.os }}-vagrant-ubuntu-bionic-
+          ${{ runner.os }}-vagrant-boxes-
     - name: Apply workaround for VBoxHeadless issue on macOS (https://www.virtualbox.org/ticket/20636)
       shell: bash
       run: |

diff --git a/README.md b/README.md
@@ -25,11 +25,11 @@ different scenarios. There are different setups located in the
 
 ## Linux Distros Supported
 
-| Name     |      Version      |
-| :------- | :---------------: |
-| Ubuntu   | 18.04/20.04/22.04 |
-| openSUSE |       Leap        |
-| Fedora   |    37/38/39/40    |
+| Name     |   Version   |
+| :------- | :---------: |
+| Ubuntu   | 20.04/22.04 |
+| openSUSE |    Leap     |
+| Fedora   | 37/38/39/40 |
 
 ## Components
 

diff --git a/config/samples/pdf.yml.distros b/config/samples/pdf.yml.distros
@@ -21,28 +21,6 @@
   roles:
     - kube_control_plane
     - etcd
-- name: ubuntu18
-  os:
-    name: ubuntu
-    release: bionic
-  networks:
-    - name: public-net
-      ip: "10.10.16.4"
-  memory: 4096
-  cpus: 1
-  storage_controllers:
-    - name: Virtual I/O Device SCSI controller
-      type: virtio-scsi
-      controller: VirtIO
-  volumes:
-    - name: sdb
-      size: 25
-      mount: /var/lib/docker/
-      controller: Virtual I/O Device SCSI controller
-      port: 1
-      device: 0
-  roles:
-    - kube_node
 - name: ubuntu20
   os:
     name: ubuntu

diff --git a/playbooks/roles/criproxy/molecule/default/molecule.yml b/playbooks/roles/criproxy/molecule/default/molecule.yml
@@ -18,8 +18,8 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: bionic-$POSTFIX_NAME
-    box: generic/ubuntu1804
+  - name: focal-$POSTFIX_NAME
+    box: generic/ubuntu2004
     box_version: 4.3.12
     memory: 3072
     cpus: 1

diff --git a/playbooks/roles/criu/molecule/default/molecule.yml b/playbooks/roles/criu/molecule/default/molecule.yml
@@ -19,8 +19,8 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yamllint .
 platforms:
-  - name: bionic-$POSTFIX_NAME
-    box: generic/ubuntu1804
+  - name: focal-$POSTFIX_NAME
+    box: generic/ubuntu2004
     box_version: 4.3.12
     memory: 3072
     cpus: 1

diff --git a/playbooks/roles/nfd/molecule/default/molecule.yml b/playbooks/roles/nfd/molecule/default/molecule.yml
@@ -19,8 +19,8 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: ubuntu-bionic-$POSTFIX_NAME
-    box: generic/ubuntu1804
+  - name: ubuntu-focal-$POSTFIX_NAME
+    box: generic/ubuntu2004
     box_version: 4.3.12
     memory: 6144
     cpus: 2

diff --git a/playbooks/roles/pmem/molecule/default/molecule.yml b/playbooks/roles/pmem/molecule/default/molecule.yml
@@ -19,8 +19,8 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: ubuntu-bionic-$POSTFIX_NAME
-    box: generic/ubuntu1804
+  - name: ubuntu-focal-$POSTFIX_NAME
+    box: generic/ubuntu2004
     box_version: 4.3.12
     memory: 6144
     cpus: 2

diff --git a/playbooks/roles/sriov_cni/molecule/default/molecule.yml b/playbooks/roles/sriov_cni/molecule/default/molecule.yml
@@ -19,8 +19,8 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: ubuntu-bionic-$POSTFIX_NAME
-    box: generic/ubuntu1804
+  - name: ubuntu-focal-$POSTFIX_NAME
+    box: generic/ubuntu2004
     box_version: 4.3.12
     memory: 6144
     cpus: 2

diff --git a/playbooks/roles/sriov_plugin/molecule/default/molecule.yml b/playbooks/roles/sriov_plugin/molecule/default/molecule.yml
@@ -19,8 +19,8 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: ubuntu-bionic-$POSTFIX_NAME
-    box: generic/ubuntu1804
+  - name: ubuntu-focal-$POSTFIX_NAME
+    box: generic/ubuntu2004
     box_version: 4.3.12
     memory: 6144
     cpus: 2

diff --git a/playbooks/roles/virtlet/templates/images.yaml.j2 b/playbooks/roles/virtlet/templates/images.yaml.j2
@@ -1,10 +1,10 @@
 translations:
-  - name: ubuntu/14.04
-    url: https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-  - name: ubuntu/16.04
-    url: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
-  - name: ubuntu/18.04
-    url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
+  - name: ubuntu/20.04
+    url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
+  - name: ubuntu/22.04
+    url: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
+  - name: ubuntu/24.04
+    url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
   - regexp: 'centos/(\d+)-(\d+)'
     url: 'https://cloud.centos.org/centos/$1/images/CentOS-$1-x86_64-GenericCloud-$2.qcow2'
   - name: fedora