From dd423b3cac9e8eea4704179b533daff49c7a2b59 Mon Sep 17 00:00:00 2001
From: a-dubs <alecwarren19@gmail.com>
Date: Fri, 31 Jan 2025 14:02:16 -0500
Subject: [PATCH] trying to use canonical/setup-lxd@v0.1.2 and ubuntu 24.04

---
 .github/workflows/ci.yaml | 46 +++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3f467fc4..8702253b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,47 +8,51 @@ concurrency:
 
 jobs:
   tox-defaults:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Install dependencies
         run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qy install tox
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run tox
         run: tox
   docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Install dependencies
         run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qy install tox
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build rtd docs
         run: tox -e docs
   integration-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Install dependencies
         run: |
           sudo apt-get update -q
           sudo apt-get install -qy distro-info tox
           sudo snap install lxd
-      - name: Initialize LXD
-        run: |
-          ssh-keygen -P "" -q -f ~/.ssh/id_rsa
-          mkdir -p ~/.config
-          echo "[lxd]" > ~/.config/pycloudlib.toml
-          sudo adduser $USER lxd
-          # Jammy GH Action runners have docker installed, which edits iptables
-          # in a way that is incompatible with lxd.
-          # https://linuxcontainers.org/lxd/docs/master/howto/network_bridge_firewalld/#prevent-issues-with-lxd-and-docker
-          sudo iptables -I DOCKER-USER -j ACCEPT
-          sudo lxd init --auto
+      # - name: Initialize LXD
+      #   run: |
+      #     ssh-keygen -P "" -q -f ~/.ssh/id_rsa
+      #     mkdir -p ~/.config
+      #     echo "[lxd]" > ~/.config/pycloudlib.toml
+      #     sudo adduser $USER lxd
+      #     # Jammy GH Action runners have docker installed, which edits iptables
+      #     # in a way that is incompatible with lxd.
+      #     # https://linuxcontainers.org/lxd/docs/master/howto/network_bridge_firewalld/#prevent-issues-with-lxd-and-docker
+      #     sudo iptables -I DOCKER-USER -j ACCEPT
+      #     sudo lxd init --auto
       - name: Git checkout
         uses: actions/checkout@v3
+      - name: Setup LXD
+        uses: canonical/setup-lxd@v0.1.2
       - name: Run CI integration tests
-        run: |
-          PYCLOUDLIB_CONFIG="${HOME}/.config/pycloudlib.toml"
-          echo "Setting pycloudlib config path to ${PYCLOUDLIB_CONFIG}"
-          export PYCLOUDLIB_CONFIG
-          sudo tox -e integration-tests-ci
+        run: tox -e integration-tests-ci
+        # run: tox -e integration-tests-ci -- --color=yes
+        # run: |
+          # PYCLOUDLIB_CONFIG="${HOME}/.config/pycloudlib.toml"
+          # echo "Setting pycloudlib config path to ${PYCLOUDLIB_CONFIG}"
+          # export PYCLOUDLIB_CONFIG
+          # sudo tox -e integration-tests-ci