From 2b6ff34b7c973917c6cdf0c741fede5201b58b11 Mon Sep 17 00:00:00 2001 From: Dima Tisnek Date: Wed, 21 May 2025 11:10:14 +0900 Subject: [PATCH 1/3] ci: don't merge, only testing CI --- CONTRIBUTORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f18d3fe76..65213714f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -9,3 +9,5 @@ Simon Richardson Jack Shaw Leon Mintz Adam Dyess +--- +Dummy change, don't merge From 29237331a12b827e2e5b48b0807e91a9a629a518 Mon Sep 17 00:00:00 2001 From: Dima Tisnek Date: Wed, 21 May 2025 12:02:10 +0900 Subject: [PATCH 2/3] ci: force 22.04 base for integration tests --- tests/base.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/base.py b/tests/base.py index 72151c2a9..edfdd6610 100644 --- a/tests/base.py +++ b/tests/base.py @@ -79,6 +79,12 @@ async def __aenter__(self): model_name = f"test-{test_run_nonce}-{test_name}-{model_nonce}" self._model = await self._controller.add_model(model_name) + # Some charms used for testing are not yet available for 24.04 + await self._model.set_config({ + "default-base": "ubuntu@22.04", + "default-series": "jammy", + }) + # Change the JujuData instance so that it will return the new # model as the current model name, so that we'll connect # to it by default. From 2b64f71ef0f6b1f40f84745b74797d7bcefb5ab7 Mon Sep 17 00:00:00 2001 From: Dima Tisnek Date: Wed, 21 May 2025 12:36:37 +0900 Subject: [PATCH 3/3] ci: force 22.04 base for integration tests --- tests/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/base.py b/tests/base.py index edfdd6610..19187b2dc 100644 --- a/tests/base.py +++ b/tests/base.py @@ -82,7 +82,7 @@ async def __aenter__(self): # Some charms used for testing are not yet available for 24.04 await self._model.set_config({ "default-base": "ubuntu@22.04", - "default-series": "jammy", + # "default-series": "jammy", # not allowed to set both }) # Change the JujuData instance so that it will return the new