From c97b843e7d8a45190e3e7887687da194299f52d2 Mon Sep 17 00:00:00 2001
From: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
Date: Tue, 24 Sep 2024 14:19:22 +0530
Subject: [PATCH] Change Github runners to run Noble.

Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
---
 .github/workflows/tests.yml  | 12 ++++++------
 tests/scripts/actionutils.sh |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f0ab8a2e..edebd426 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -236,7 +236,7 @@ jobs:
 
   multi-node-tests:
     name: Multi node testing
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-microceph
     steps:
     - name: Download snap
@@ -365,7 +365,7 @@ jobs:
 
   multi-node-tests-with-custom-microceph-ip:
     name: Multi node testing with custom microceph IP
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-microceph
     steps:
     - name: Download snap
@@ -422,7 +422,7 @@ jobs:
 
   loop-file-tests:
     name: Test with loopback file OSDs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-microceph
     steps:
     - name: Download snap
@@ -475,7 +475,7 @@ jobs:
 
   wal-db-tests:
     name: Test WAL/DB device usage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-microceph
     steps:
     - name: Download snap
@@ -541,7 +541,7 @@ jobs:
 
   upgrade-quincy-tests:
     name: Test quincy upgrades
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-microceph
     steps:
     - name: Download snap
@@ -609,7 +609,7 @@ jobs:
 
   cluster-tests:
     name: Test MicroCeph Cluster features.
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-microceph
     steps:
     - name: Download snap
diff --git a/tests/scripts/actionutils.sh b/tests/scripts/actionutils.sh
index 8786c28c..27c9a7e3 100755
--- a/tests/scripts/actionutils.sh
+++ b/tests/scripts/actionutils.sh
@@ -12,6 +12,7 @@ function cleaript() {
 function setup_lxd() {
     sudo snap refresh
     sudo snap set lxd daemon.group=adm
+    sudo getent group lxd | grep -qwF "$USER" || sudo usermod -aG lxd "$USER"
     sudo lxd init --auto
 }