Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions spread.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ backends:
CONCIERGE_EXTRA_SNAPS: charmcraft
CONCIERGE_EXTRA_DEBS: pipx
systems:
- ubuntu-22.04:
- ubuntu-24.04:
username: runner
prepare: |
systemctl disable --now unattended-upgrades.service
Expand Down Expand Up @@ -97,7 +97,7 @@ backends:
LANDSCAPE_ACCOUNT_NAME: '$(HOST: echo $LANDSCAPE_ACCOUNT_NAME)'
LANDSCAPE_REGISTRATION_KEY: '$(HOST: echo $LANDSCAPE_REGISTRATION_KEY)'
systems:
- ubuntu-22.04:
- ubuntu-24.04:
username: runner
- ubuntu-24.04-arm:
username: runner
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/ha_tests/test_stereo_mode.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
import logging

import pytest
from constants import RAFT_PARTNER_PREFIX
from pysyncobj.utility import TcpUtility
from pytest_operator.plugin import OpsTest
from tenacity import Retrying, stop_after_delay, wait_fixed
from yaml import safe_load

from constants import RAFT_PARTNER_PREFIX

from ..helpers import APPLICATION_NAME, DATABASE_APP_NAME
from .helpers import APPLICATION_NAME as TEST_APP_NAME
from .helpers import (
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import pytest
import requests
import yaml
from constants import DATABASE_DEFAULT_NAME, PEER, SYSTEM_USERS_PASSWORD_CONFIG
from juju.model import Model
from juju.unit import Unit
from pytest_operator.plugin import OpsTest
Expand All @@ -32,6 +31,8 @@
wait_fixed,
)

from constants import DATABASE_DEFAULT_NAME, PEER, SYSTEM_USERS_PASSWORD_CONFIG

CHARM_BASE = "ubuntu@22.04"
METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
DATABASE_APP_NAME = METADATA["name"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@

import jubilant
import requests
from constants import PEER
from jubilant import Juju
from jubilant.statustypes import Status, UnitStatus
from tenacity import Retrying, stop_after_delay, wait_fixed

from constants import PEER

from ..helpers import execute_queries_on_unit

MINUTE_SECS = 60
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/jubilant_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import pytest
import requests
import yaml
from constants import DATABASE_DEFAULT_NAME, PEER, SYSTEM_USERS_PASSWORD_CONFIG
from tenacity import (
RetryError,
Retrying,
Expand All @@ -32,6 +31,8 @@
wait_fixed,
)

from constants import DATABASE_DEFAULT_NAME, PEER, SYSTEM_USERS_PASSWORD_CONFIG

from .adapters import JujuFixture, ModelAdapter, UnitAdapter
from .ha_tests.helpers import ProcessError
from .helpers import DATABASE_APP_NAME, SecretNotFoundError
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/new_relations/test_new_relations_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
import psycopg2
import pytest
import yaml
from constants import DATABASE_DEFAULT_NAME
from pytest_operator.plugin import OpsTest
from tenacity import Retrying, stop_after_attempt, wait_fixed

from constants import DATABASE_DEFAULT_NAME

from ..helpers import (
CHARM_BASE,
assert_sync_standbys,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@

import psycopg2
import pytest
from constants import DATABASE_DEFAULT_NAME
from pytest_operator.plugin import OpsTest

from constants import DATABASE_DEFAULT_NAME

from ..helpers import CHARM_BASE, DATABASE_APP_NAME
from .helpers import build_connection_string
from .test_new_relations_1 import DATA_INTEGRATOR_APP_NAME
Expand Down
72 changes: 0 additions & 72 deletions tests/integration/pyproject.toml

This file was deleted.

3 changes: 2 additions & 1 deletion tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
import psycopg2
import pytest
import requests
from locales import SNAP_LOCALES
from psycopg2 import sql
from tenacity import Retrying, stop_after_attempt, wait_exponential, wait_fixed

from locales import SNAP_LOCALES

from .adapters import JujuFixture
from .jubilant_helpers import (
DATABASE_APP_NAME,
Expand Down
2 changes: 1 addition & 1 deletion tests/spread/test_logical_replication.py/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ execute: |
artifacts:
- allure-results
systems:
- -ubuntu-22.04
- -ubuntu-24.04
- -ubuntu-24.04-arm
Loading