diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8b807eb959..3a7f85189e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -69,6 +69,9 @@ jobs: name: Build charm uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v42.0.1 permissions: {} + with: + cache: false + charmcraft-snap-channel: latest/candidate integration-test: name: Integration test charm diff --git a/charmcraft.yaml b/charmcraft.yaml index 2ae1588927..beade96cb2 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -3,8 +3,8 @@ type: charm platforms: - ubuntu@24.04:amd64: - ubuntu@24.04:arm64: + ubuntu@26.04:amd64: + ubuntu@26.04:arm64: # Files implicitly created by charmcraft without a part: # - dispatch (https://github.com/canonical/charmcraft/pull/1898) # - manifest.yaml diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 3ed241fe5f..d68915baee 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -28,7 +28,7 @@ def charm(): # Return str instead of pathlib.Path since python-libjuju's model.deploy(), juju deploy, and # juju bundle files expect local charms to begin with `./` or `/` to distinguish them from # Charmhub charms. - return f"./postgresql_ubuntu@24.04-{architecture.architecture}.charm" + return f"./postgresql_ubuntu@26.04-{architecture.architecture}.charm" def get_cloud_config(cloud: str) -> tuple[dict[str, str], dict[str, str]] | None: diff --git a/tests/integration/high_availability/test_async_replication.py b/tests/integration/high_availability/test_async_replication.py index d9c906a177..895e08b6cf 100644 --- a/tests/integration/high_availability/test_async_replication.py +++ b/tests/integration/high_availability/test_async_replication.py @@ -92,7 +92,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None: model_1.deploy( charm=charm, app=DB_APP_1, - base="ubuntu@24.04", + base="ubuntu@26.04", config=configuration, constraints=constraints, num_units=3, @@ -101,7 +101,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None: model_2.deploy( charm=charm, app=DB_APP_2, - base="ubuntu@24.04", + base="ubuntu@26.04", config=configuration, constraints=constraints, num_units=3, @@ -113,7 +113,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None: model_1.deploy( charm=DB_TEST_APP_NAME, app=DB_TEST_APP_1, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="latest/edge", num_units=1, constraints=constraints, @@ -121,7 +121,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None: model_2.deploy( charm=DB_TEST_APP_NAME, app=DB_TEST_APP_2, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="latest/edge", num_units=1, constraints=constraints, diff --git a/tests/integration/high_availability/test_async_replication_upgrade.py b/tests/integration/high_availability/test_async_replication_upgrade.py index e491184395..739e7cfcc2 100644 --- a/tests/integration/high_availability/test_async_replication_upgrade.py +++ b/tests/integration/high_availability/test_async_replication_upgrade.py @@ -91,7 +91,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None: model_1.deploy( charm=DB_APP_NAME, app=DB_APP_1, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="16/stable", config=configuration, constraints=constraints, @@ -101,7 +101,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None: model_2.deploy( charm=DB_APP_NAME, app=DB_APP_2, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="16/stable", config=configuration, constraints=constraints, @@ -113,7 +113,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None: model_1.deploy( charm=DB_TEST_APP_NAME, app=DB_TEST_APP_NAME, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="latest/edge", constraints=constraints, num_units=1, diff --git a/tests/integration/high_availability/test_upgrade.py b/tests/integration/high_availability/test_upgrade.py index 168ffd4fd8..7adc018a83 100644 --- a/tests/integration/high_availability/test_upgrade.py +++ b/tests/integration/high_availability/test_upgrade.py @@ -34,7 +34,7 @@ def test_deploy_latest(juju: Juju) -> None: juju.deploy( charm=DB_APP_NAME, app=DB_APP_NAME, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="16/edge", config={"profile": "testing"}, num_units=3, @@ -42,7 +42,7 @@ def test_deploy_latest(juju: Juju) -> None: juju.deploy( charm=DB_TEST_APP_NAME, app=DB_TEST_APP_NAME, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="latest/edge", num_units=1, ) diff --git a/tests/integration/high_availability/test_upgrade_from_stable.py b/tests/integration/high_availability/test_upgrade_from_stable.py index 5f25679602..d74c7f5a4f 100644 --- a/tests/integration/high_availability/test_upgrade_from_stable.py +++ b/tests/integration/high_availability/test_upgrade_from_stable.py @@ -28,7 +28,7 @@ def test_deploy_stable(juju: Juju) -> None: juju.deploy( charm=DB_APP_NAME, app=DB_APP_NAME, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="16/stable", config={"profile": "testing"}, num_units=3, @@ -36,7 +36,7 @@ def test_deploy_stable(juju: Juju) -> None: juju.deploy( charm=DB_TEST_APP_NAME, app=DB_TEST_APP_NAME, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="latest/edge", num_units=1, ) diff --git a/tests/integration/high_availability/test_upgrade_skip_pre_upgrade_check.py b/tests/integration/high_availability/test_upgrade_skip_pre_upgrade_check.py index 8590227c08..c88af4b5d5 100644 --- a/tests/integration/high_availability/test_upgrade_skip_pre_upgrade_check.py +++ b/tests/integration/high_availability/test_upgrade_skip_pre_upgrade_check.py @@ -27,7 +27,7 @@ def test_deploy_stable(juju: Juju) -> None: juju.deploy( charm=DB_APP_NAME, app=DB_APP_NAME, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="16/stable", config={"profile": "testing"}, num_units=3, @@ -35,7 +35,7 @@ def test_deploy_stable(juju: Juju) -> None: juju.deploy( charm=DB_TEST_APP_NAME, app=DB_TEST_APP_NAME, - base="ubuntu@24.04", + base="ubuntu@26.04", channel="latest/edge", num_units=1, )