From e8d72f465b9ad033821cad30c75a5dae50076818 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Tue, 26 Nov 2024 03:34:35 -0800
Subject: [PATCH 1/2] Pin websockets library (#669)

* Pin websockets library

Set upper bound for websockets until libjuju is compatible with newer
versions.

See https://github.com/juju/python-libjuju/pull/1208

* Migrate to actions/upload-artifact@v4

(cherry picked from commit d758d6dde3cf7af0d9f1bf3e90c80ca83c14f7b5)
---
 .github/workflows/tox.yaml | 2 +-
 requirements.txt           | 4 ++++
 setup.py                   | 3 +++
 test-requirements.txt      | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml
index 92da89ed6..1c6f058b9 100644
--- a/.github/workflows/tox.yaml
+++ b/.github/workflows/tox.yaml
@@ -80,7 +80,7 @@ jobs:
         juju crashdump -m $model -o logs/
     - name: upload logs on failure
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: test-run-logs-and-crashdump
         path: logs/
diff --git a/requirements.txt b/requirements.txt
index d4288cbe6..71fdf65d5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,3 +37,7 @@ sphinx
 sphinxcontrib-asyncio
 # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
 macaroonbakery!=1.3.3
+
+# NOTE(freyes): Set upper bound for websockets until libjuju is compatible with
+# newer versions. See https://github.com/juju/python-libjuju/pull/1208
+websockets<13.0.0
diff --git a/setup.py b/setup.py
index 168fb9e54..1fbd4c18b 100644
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,9 @@
 
     # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
     'macaroonbakery != 1.3.3',
+    # NOTE(freyes): Set upper bound for websockets until libjuju is compatible
+    # with newer versions. See https://github.com/juju/python-libjuju/pull/1208
+    'websockets<13.0.0',
 ]
 
 tests_require = [
diff --git a/test-requirements.txt b/test-requirements.txt
index 371b1326b..bc5ac9d9f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,6 +16,10 @@ keystoneauth1
 oslo.config
 python-novaclient
 tenacity>8.2.0
+# NOTE(freyes): Set upper bound for websockets until libjuju is compatible with
+# newer versions. See https://github.com/juju/python-libjuju/pull/1208
+websockets<13.0.0
+
 # pinned until 3.0 regressions are handled: https://github.com/openstack-charmers/zaza/issues/545
 juju<3.0
 # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94

From 8e83fd53f5c6641ad9b476041ed0ac301af3e660 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Wed, 27 Nov 2024 10:21:44 -0300
Subject: [PATCH 2/2] Add action jlumbroso/free-disk-space@main

It frees up space from the runner

(cherry picked from commit 6fafeb9571123976b67324e0710f7a0b7b8c31c0)
---
 .github/workflows/tox.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml
index 1c6f058b9..5a01019b3 100644
--- a/.github/workflows/tox.yaml
+++ b/.github/workflows/tox.yaml
@@ -45,6 +45,13 @@ jobs:
     needs: build
     steps:
     - uses: actions/checkout@v1
+    - name: Free Disk Space (Ubuntu)
+      uses: jlumbroso/free-disk-space@main
+      with:
+        tool-cache: false
+        large-packages: false
+        docker-images: false
+        swap-storage: false
     - name: Install dependencies
       run: |
         set -euxo pipefail