Skip to content

DO NOT MERGE test build 26.04 #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
carlcsaposs-canonical wants to merge 3 commits into
base: 16/edge
Choose a base branch
from
Draft

DO NOT MERGE test build 26.04 #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10b16c0
DO NOT MERGE test build 26.04
carlcsaposs-canonical Apr 3, 2026
447b53e
disable cache
carlcsaposs-canonical Apr 3, 2026
42117bf
blindly replace 24.04 with 26.04 in tests without checking usages
carlcsaposs-canonical Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charmcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/high_availability/test_async_replication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -113,15 +113,15 @@ 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,
)
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,
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/high_availability/test_async_replication_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/high_availability/test_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ 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,
)
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,
)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/high_availability/test_upgrade_from_stable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ 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,
)
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,
)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/high_availability/test_upgrade_skip_pre_upgrade_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ 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,
)
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,
)
Expand Down
Loading