From 2f53b0c3d5a6e3fb421d00accf4e72644e12f980 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Tue, 20 Sep 2022 09:14:59 +0200
Subject: [PATCH] ci: remove rocky8 tests and switch to rocky9

---
 .drone.jsonnet                                    | 4 ++--
 .drone.yml                                        | 8 ++++----
 handlers/main.yml                                 | 9 ---------
 molecule/{rocky8 => rocky9}/converge.yml          | 0
 molecule/{rocky8 => rocky9}/create.yml            | 0
 molecule/{rocky8 => rocky9}/destroy.yml           | 0
 molecule/{rocky8 => rocky9}/molecule.yml          | 4 ++--
 molecule/{rocky8 => rocky9}/prepare.yml           | 0
 molecule/{rocky8 => rocky9}/tests/test_default.py | 2 --
 9 files changed, 8 insertions(+), 19 deletions(-)
 rename molecule/{rocky8 => rocky9}/converge.yml (100%)
 rename molecule/{rocky8 => rocky9}/create.yml (100%)
 rename molecule/{rocky8 => rocky9}/destroy.yml (100%)
 rename molecule/{rocky8 => rocky9}/molecule.yml (91%)
 rename molecule/{rocky8 => rocky9}/prepare.yml (100%)
 rename molecule/{rocky8 => rocky9}/tests/test_default.py (90%)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 38334f9..4eecb44 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -116,7 +116,7 @@ local PipelineDocumentation = {
   },
   depends_on: [
     'testing-centos7',
-    'testing-rocky8',
+    'testing-rocky9',
   ],
 };
 
@@ -155,7 +155,7 @@ local PipelineNotification = {
 [
   PipelineLinting,
   PipelineDeployment(scenario='centos7'),
-  PipelineDeployment(scenario='rocky8'),
+  PipelineDeployment(scenario='rocky9'),
   PipelineDocumentation,
   PipelineNotification,
 ]
diff --git a/.drone.yml b/.drone.yml
index e260eaf..6ecadcb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -69,7 +69,7 @@ depends_on:
 
 ---
 kind: pipeline
-name: testing-rocky8
+name: testing-rocky9
 
 platform:
   os: linux
@@ -86,7 +86,7 @@ steps:
   - name: ansible-molecule
     image: thegeeklab/molecule:3
     commands:
-      - molecule test -s rocky8
+      - molecule test -s rocky9
     environment:
       HCLOUD_TOKEN:
         from_secret: hcloud_token
@@ -142,7 +142,7 @@ trigger:
 
 depends_on:
   - testing-centos7
-  - testing-rocky8
+  - testing-rocky9
 
 ---
 kind: pipeline
@@ -182,6 +182,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 9805c1bf3e21a42abc832112ef8ad5e4204862d517e3d4831bbd4946a654693e
+hmac: e5b086ac86622b35b4555a8450cf8a1a6ffc5caff37a4290ab563078d6c54128
 
 ...
diff --git a/handlers/main.yml b/handlers/main.yml
index fb4a75c..d118017 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -5,15 +5,6 @@
   become: True
   become_user: root
 
-- name: Rebuild grub config
-  command: "{{ item }}"
-  listen: __kernel_grub_rebuild
-  loop:
-    - grub2-mkconfig -o /boot/grub2/grub.cfg
-    - grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg
-  become: True
-  become_user: root
-
 - name: Reboot server
   reboot:
     reboot_timeout: 600
diff --git a/molecule/rocky8/converge.yml b/molecule/rocky9/converge.yml
similarity index 100%
rename from molecule/rocky8/converge.yml
rename to molecule/rocky9/converge.yml
diff --git a/molecule/rocky8/create.yml b/molecule/rocky9/create.yml
similarity index 100%
rename from molecule/rocky8/create.yml
rename to molecule/rocky9/create.yml
diff --git a/molecule/rocky8/destroy.yml b/molecule/rocky9/destroy.yml
similarity index 100%
rename from molecule/rocky8/destroy.yml
rename to molecule/rocky9/destroy.yml
diff --git a/molecule/rocky8/molecule.yml b/molecule/rocky9/molecule.yml
similarity index 91%
rename from molecule/rocky8/molecule.yml
rename to molecule/rocky9/molecule.yml
index 2f28e60..cd285d1 100644
--- a/molecule/rocky8/molecule.yml
+++ b/molecule/rocky9/molecule.yml
@@ -9,8 +9,8 @@ dependency:
 driver:
   name: delegated
 platforms:
-  - name: rocky8-kernel
-    image: rocky-8
+  - name: rocky9-kernel
+    image: rocky-9
     server_type: cx11
 lint: |
   /usr/local/bin/flake8
diff --git a/molecule/rocky8/prepare.yml b/molecule/rocky9/prepare.yml
similarity index 100%
rename from molecule/rocky8/prepare.yml
rename to molecule/rocky9/prepare.yml
diff --git a/molecule/rocky8/tests/test_default.py b/molecule/rocky9/tests/test_default.py
similarity index 90%
rename from molecule/rocky8/tests/test_default.py
rename to molecule/rocky9/tests/test_default.py
index 3d6d2d7..9b6635f 100644
--- a/molecule/rocky8/tests/test_default.py
+++ b/molecule/rocky9/tests/test_default.py
@@ -34,8 +34,6 @@ def test_coredump_config(host):
 
 
 def test_cgroup_config(host):
-    grub = host.file("/boot/grub2/grubenv")
     proc = host.run("mount -l | grep cgroup")
 
-    assert grub.contains("systemd.unified_cgroup_hierarchy=1")
     assert "cgroup2 on /sys/fs/cgroup type cgroup2" in proc.stdout