From 060f2e8ea3baab16d37a71d7020dd6e8226edf7b Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Mon, 13 May 2024 13:49:53 +0200
Subject: [PATCH 1/2] misc: Vagrantfile update

---
 misc/Vagrantfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/misc/Vagrantfile b/misc/Vagrantfile
index da8dc1602..397895a6a 100644
--- a/misc/Vagrantfile
+++ b/misc/Vagrantfile
@@ -47,20 +47,20 @@ Vagrant.configure("2") do |config|
     ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python3" }
   end
 
-  config.vm.define "bd-f38", primary: true, autostart: true do |f38|
-    f38.vm.box = "fedora/38-cloud-base"
+  config.vm.define "bd-f40", primary: true, autostart: true do |f40|
+    f40.vm.box = "fedora/40-cloud-base"
   end
 
-  config.vm.define "bd-f37", primary: false, autostart: false do |f37|
-    f37.vm.box = "fedora/37-cloud-base"
+  config.vm.define "bd-f39", primary: false, autostart: false do |f39|
+    f39.vm.box = "fedora/39-cloud-base"
   end
 
   config.vm.define "bd-cs8", primary: false, autostart: false do |cs8|
     cs8.vm.box = "centos/stream8"
   end
 
-  config.vm.define "bd-u2204", primary: false, autostart: false do |u2204|
-    u2204.vm.box = "generic/ubuntu2204"
+  config.vm.define "bd-u2404", primary: false, autostart: false do |u2404|
+    u2404.vm.box = "generic/ubuntu2404"
   end
 
   config.vm.define "bd-debiant", primary: false, autostart: false do |debiant|

From 6957312de73609251c2cc5c986602b3c49cf05b3 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Mon, 13 May 2024 13:51:27 +0200
Subject: [PATCH 2/2] misc: Remove CentOS 8 Stream from Vagrantfile and test
 dependencies

CentOS 8 Stream EOL is at the end of May and we no longer use it
in our CI so we can remove it from here as well.
---
 misc/Vagrantfile                   |  4 --
 misc/install-test-dependencies.yml | 62 ------------------------------
 tests/skip.yml                     | 12 ------
 3 files changed, 78 deletions(-)

diff --git a/misc/Vagrantfile b/misc/Vagrantfile
index 397895a6a..3c334572a 100644
--- a/misc/Vagrantfile
+++ b/misc/Vagrantfile
@@ -55,10 +55,6 @@ Vagrant.configure("2") do |config|
     f39.vm.box = "fedora/39-cloud-base"
   end
 
-  config.vm.define "bd-cs8", primary: false, autostart: false do |cs8|
-    cs8.vm.box = "centos/stream8"
-  end
-
   config.vm.define "bd-u2404", primary: false, autostart: false do |u2404|
     u2404.vm.box = "generic/ubuntu2404"
   end
diff --git a/misc/install-test-dependencies.yml b/misc/install-test-dependencies.yml
index 14a04e4ff..9a3734d2c 100644
--- a/misc/install-test-dependencies.yml
+++ b/misc/install-test-dependencies.yml
@@ -69,68 +69,6 @@
       - xfsprogs
     when: ansible_distribution == 'Fedora' and test_dependencies|bool
 
-####### CentOS 8
-  - name: Install basic build tools (CentOS 8)
-    package: name={{item}} state=present
-    with_items:
-      - gcc
-      - make
-      - libtool
-      - autoconf
-      - automake
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
-
-  - name: Enable EPEL repository (CentOS 8)
-    package: name=epel-release state=present
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
-
-  - name: Enable powertools repository (CentOS 8)
-    command: yum config-manager --set-enabled powertools
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
-
-  - name: Install dnf-plugins-core for dnf builddep (CentOS 8)
-    package: name=dnf-plugins-core state=present
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
-
-  - name: Install build dependencies (CentOS 8)
-    command: "dnf -y builddep libblockdev --nogpgcheck"
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
-
-  - name: Install build dependencies not covered by dnf builddep (CentOS 8)
-    package: name={{item}} state=present
-    with_items:
-      - libfdisk-devel
-      - keyutils-libs-devel
-      - e2fsprogs-devel
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
-
-  - name: Install test dependencies (CentOS 8)
-    package: name={{item}} state=present
-    with_items:
-      - cryptsetup
-      - device-mapper-multipath
-      - dosfstools
-      - e2fsprogs
-      - glibc-all-langpacks
-      - kmod-kvdo
-      - lvm2-dbusd
-      - mdadm
-      - ndctl
-      - nss-tools
-      - ntfsprogs
-      - nvme-cli
-      - nvmetcli
-      - python3-bytesize
-      - python3-dbus
-      - python3-packaging
-      - python3-pylint
-      - python3-yaml
-      - targetcli
-      - vdo
-      - volume_key
-      - xfsprogs
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8' and test_dependencies|bool
-
 ####### Debian/Ubuntu
   - name: Update apt cache (Debian/Ubuntu)
     apt:
diff --git a/tests/skip.yml b/tests/skip.yml
index e8b997069..91d4eae9b 100644
--- a/tests/skip.yml
+++ b/tests/skip.yml
@@ -49,15 +49,3 @@
   skip_on:
     - arch: "i686"
       reason: "Cache attach/detach fails with ENOMEM on 32bit systems"
-
-- test: lvm_dbus_tests.LvmTestLVcreateRemove
-  skip_on:
-   - distro: "centos"
-     version: "8"
-     reason: "LVM DBus doesn't include error message from the command line on CentOS/RHEL 8"
-
-- test: nvme_test
-  skip_on:
-    - distro: "centos"
-      version: "8"
-      reason: "required version of libnvme is not available CentOS 8"