From 6b4bf88ee1e6c2a214e9a2cbfa4d540f65e1c13e Mon Sep 17 00:00:00 2001
From: "Louise K. Schmidtgen" <louise.schmidtgen@canonical.com>
Date: Wed, 3 Jul 2024 15:32:45 +0200
Subject: [PATCH] E2E test use lxd 5.21 & ubuntu 24.04 LTS (#526)

* nightly 24.04

* integration 24.04 lxd 5.21

* add test trigger

* lxd 5.21 informing e2e

* rm test trigger
---
 .github/workflows/integration-informing.yaml | 3 ++-
 .github/workflows/integration.yaml           | 5 +++--
 .github/workflows/nightly-test.yaml          | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integration-informing.yaml b/.github/workflows/integration-informing.yaml
index 6197a3911..7fb273ef6 100644
--- a/.github/workflows/integration-informing.yaml
+++ b/.github/workflows/integration-informing.yaml
@@ -28,6 +28,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Install lxd
         run: |
+          sudo snap refresh lxd --channel 5.21/stable
           sudo lxd init --auto
           sudo usermod --append --groups lxd $USER
           sg lxd -c 'lxc version'
@@ -67,7 +68,7 @@ jobs:
         run: pip install tox
       - name: Install lxd
         run: |
-          sudo snap refresh lxd --channel 5.19/stable
+          sudo snap refresh lxd --channel 5.21/stable
           sudo lxd init --auto
           sudo usermod --append --groups lxd $USER
           sg lxd -c 'lxc version'
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 2ba44214a..bb91c8f67 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -28,6 +28,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Install lxd
         run: |
+          sudo snap refresh lxd --channel 5.21/stable
           sudo lxd init --auto
           sudo usermod --append --groups lxd $USER
           sg lxd -c 'lxc version'
@@ -48,7 +49,7 @@ jobs:
     name: Test ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["ubuntu:20.04", "ubuntu:22.04"]
+        os: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"]
     runs-on: ubuntu-20.04
     needs: build
 
@@ -63,7 +64,7 @@ jobs:
         run: pip install tox
       - name: Install lxd
         run: |
-          sudo snap refresh lxd --channel 5.19/stable
+          sudo snap refresh lxd --channel 5.21/stable
           sudo lxd init --auto
           sudo usermod --append --groups lxd $USER
           sg lxd -c 'lxc version'
diff --git a/.github/workflows/nightly-test.yaml b/.github/workflows/nightly-test.yaml
index 04184b4d9..915d6c3f3 100644
--- a/.github/workflows/nightly-test.yaml
+++ b/.github/workflows/nightly-test.yaml
@@ -2,7 +2,7 @@ name: Nightly Latest/Edge Tests
 
 on:
   schedule:
-    - cron: '0 0 * * *'  # Runs every midnight
+    - cron: '0 0 * * *' # Runs every midnight
 
 permissions:
   contents: read
@@ -12,7 +12,7 @@ jobs:
     name: Integration Test ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.releases }}
     strategy:
       matrix:
-        os: ["ubuntu:20.04", "ubuntu:22.04"]
+        os: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"]
         arch: ["amd64", "arm64"]
         releases: ["latest/edge"]
       fail-fast: false # TODO: remove once arm64 works