diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2120c97fc3..b3fc61ed3b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -59,6 +59,8 @@ jobs: allure_on_amd64: false - agent: 3.4.6 # renovate: juju-agent-pin-minor allure_on_amd64: true + - snap_channel: 3.6/candidate + allure_on_amd64: false architecture: - amd64 include: @@ -66,7 +68,11 @@ jobs: agent: 3.4.6 # renovate: juju-agent-pin-minor allure_on_amd64: true architecture: arm64 - name: Integration | ${{ matrix.juju.agent }} | ${{ matrix.architecture }} + - juju: + snap_channel: 3.6/candidate + allure_on_amd64: false + architecture: arm64 + name: Integration | ${{ matrix.juju.agent || matrix.juju.snap_channel }} | ${{ matrix.architecture }} needs: - lint - unit-test @@ -78,6 +84,7 @@ jobs: cloud: microk8s microk8s-snap-channel: 1.31-strict/stable # renovate: latest microk8s juju-agent-version: ${{ matrix.juju.agent }} + juju-snap-channel: ${{ matrix.juju.snap_channel }} libjuju-version-constraint: ${{ matrix.juju.libjuju }} _beta_allure_report: ${{ matrix.juju.allure_on_amd64 && matrix.architecture == 'amd64' }} secrets: diff --git a/tests/integration/ha_tests/test_async_replication.py b/tests/integration/ha_tests/test_async_replication.py index 91cd0b1bf7..3c5ea5ea09 100644 --- a/tests/integration/ha_tests/test_async_replication.py +++ b/tests/integration/ha_tests/test_async_replication.py @@ -18,6 +18,7 @@ from .. import architecture, markers from ..helpers import ( APPLICATION_NAME, + CHARM_BASE, DATABASE_APP_NAME, build_and_deploy, get_leader_unit, @@ -112,8 +113,12 @@ async def test_deploy_async_replication_setup( """Build and deploy two PostgreSQL cluster in two separate models to test async replication.""" await build_and_deploy(ops_test, CLUSTER_SIZE, wait_for_idle=False) await build_and_deploy(ops_test, CLUSTER_SIZE, wait_for_idle=False, model=second_model) - await ops_test.model.deploy(APPLICATION_NAME, channel="latest/edge", num_units=1) - await second_model.deploy(APPLICATION_NAME, channel="latest/edge", num_units=1) + await ops_test.model.deploy( + APPLICATION_NAME, channel="latest/edge", num_units=1, base=CHARM_BASE + ) + await second_model.deploy( + APPLICATION_NAME, channel="latest/edge", num_units=1, base=CHARM_BASE + ) async with ops_test.fast_forward(), fast_forward(second_model): await gather( diff --git a/tests/integration/ha_tests/test_replication.py b/tests/integration/ha_tests/test_replication.py index 33ed3ed66b..fcc88cd1d8 100644 --- a/tests/integration/ha_tests/test_replication.py +++ b/tests/integration/ha_tests/test_replication.py @@ -9,7 +9,7 @@ from ..helpers import ( APPLICATION_NAME, - CHARM_SERIES, + CHARM_BASE, app_name, build_and_deploy, db_connect, @@ -43,7 +43,7 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None: await ops_test.model.deploy( APPLICATION_NAME, application_name=APPLICATION_NAME, - series=CHARM_SERIES, + base=CHARM_BASE, channel="edge", ) diff --git a/tests/integration/ha_tests/test_rollback_to_master_label.py b/tests/integration/ha_tests/test_rollback_to_master_label.py index 4bb1ad23f8..8043b4aa8a 100644 --- a/tests/integration/ha_tests/test_rollback_to_master_label.py +++ b/tests/integration/ha_tests/test_rollback_to_master_label.py @@ -15,7 +15,7 @@ from ..architecture import architecture from ..helpers import ( APPLICATION_NAME, - CHARM_SERIES, + CHARM_BASE, DATABASE_APP_NAME, get_leader_unit, get_primary, @@ -47,13 +47,14 @@ async def test_deploy_stable(ops_test: OpsTest) -> None: num_units=3, channel="14/stable", revision=LABEL_REVISION, - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, ), ops_test.model.deploy( APPLICATION_NAME, num_units=1, channel="latest/edge", + base=CHARM_BASE, ), ) logger.info("Wait for applications to become active") diff --git a/tests/integration/ha_tests/test_self_healing.py b/tests/integration/ha_tests/test_self_healing.py index ba59e84764..1afd64239c 100644 --- a/tests/integration/ha_tests/test_self_healing.py +++ b/tests/integration/ha_tests/test_self_healing.py @@ -12,7 +12,7 @@ from .. import markers from ..helpers import ( APPLICATION_NAME, - CHARM_SERIES, + CHARM_BASE, METADATA, app_name, build_and_deploy, @@ -69,7 +69,7 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None: await ops_test.model.deploy( APPLICATION_NAME, application_name=APPLICATION_NAME, - series=CHARM_SERIES, + base=CHARM_BASE, channel="edge", ) diff --git a/tests/integration/ha_tests/test_smoke.py b/tests/integration/ha_tests/test_smoke.py index 286a403688..9c8fe45efd 100644 --- a/tests/integration/ha_tests/test_smoke.py +++ b/tests/integration/ha_tests/test_smoke.py @@ -12,7 +12,7 @@ from .. import markers from ..helpers import ( - CHARM_SERIES, + CHARM_BASE, DATABASE_APP_NAME, scale_application, ) @@ -56,7 +56,7 @@ async def test_app_force_removal(ops_test: OpsTest): application_name=DATABASE_APP_NAME, num_units=1, channel="14/stable", - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ) @@ -169,7 +169,7 @@ async def test_app_resources_conflicts(ops_test: OpsTest): application_name=DUP_DATABASE_APP_NAME, num_units=1, channel="14/stable", - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ) diff --git a/tests/integration/ha_tests/test_upgrade.py b/tests/integration/ha_tests/test_upgrade.py index 72c7ccf657..a8f9c2960b 100644 --- a/tests/integration/ha_tests/test_upgrade.py +++ b/tests/integration/ha_tests/test_upgrade.py @@ -14,6 +14,7 @@ from ..helpers import ( APPLICATION_NAME, + CHARM_BASE, DATABASE_APP_NAME, METADATA, count_switchovers, @@ -44,11 +45,13 @@ async def test_deploy_latest(ops_test: OpsTest) -> None: channel="14/edge", trust=True, config={"profile": "testing"}, + base=CHARM_BASE, ), ops_test.model.deploy( APPLICATION_NAME, num_units=1, channel="latest/edge", + base=CHARM_BASE, ), ) logger.info("Wait for applications to become active") diff --git a/tests/integration/ha_tests/test_upgrade_from_stable.py b/tests/integration/ha_tests/test_upgrade_from_stable.py index 24e5d920af..ac221930e1 100644 --- a/tests/integration/ha_tests/test_upgrade_from_stable.py +++ b/tests/integration/ha_tests/test_upgrade_from_stable.py @@ -13,6 +13,7 @@ from .. import markers from ..helpers import ( APPLICATION_NAME, + CHARM_BASE, DATABASE_APP_NAME, METADATA, count_switchovers, @@ -42,11 +43,13 @@ async def test_deploy_stable(ops_test: OpsTest) -> None: num_units=3, channel="14/stable", trust=True, + base=CHARM_BASE, ), ops_test.model.deploy( APPLICATION_NAME, num_units=1, channel="latest/edge", + base=CHARM_BASE, ), ) logger.info("Wait for applications to become active") diff --git a/tests/integration/ha_tests/test_upgrade_to_primary_label.py b/tests/integration/ha_tests/test_upgrade_to_primary_label.py index 48ce47217c..a3835370c1 100644 --- a/tests/integration/ha_tests/test_upgrade_to_primary_label.py +++ b/tests/integration/ha_tests/test_upgrade_to_primary_label.py @@ -13,12 +13,14 @@ from ..architecture import architecture from ..helpers import ( APPLICATION_NAME, + CHARM_BASE, CHARM_SERIES, DATABASE_APP_NAME, get_leader_unit, get_primary, get_unit_by_index, ) +from ..juju_ import juju_major_version from .helpers import ( are_writes_increasing, check_writes, @@ -36,19 +38,26 @@ @pytest.mark.abort_on_fail async def test_deploy_stable(ops_test: OpsTest) -> None: """Simple test to ensure that the PostgreSQL and application charms get deployed.""" + database_additional_params = {} + if juju_major_version >= 3: + database_additional_params["base"] = CHARM_BASE + else: + database_additional_params["series"] = CHARM_SERIES + await asyncio.gather( ops_test.model.deploy( DATABASE_APP_NAME, num_units=3, channel="14/stable", revision=(280 if architecture == "arm64" else 281), - series=CHARM_SERIES, trust=True, + **database_additional_params, ), ops_test.model.deploy( APPLICATION_NAME, num_units=1, channel="latest/edge", + base=CHARM_BASE, ), ) logger.info("Wait for applications to become active") diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py index f44d695464..9a0c4c5c0c 100644 --- a/tests/integration/helpers.py +++ b/tests/integration/helpers.py @@ -33,6 +33,7 @@ wait_fixed, ) +CHARM_BASE = "ubuntu@22.04" CHARM_SERIES = "jammy" METADATA = yaml.safe_load(Path("./metadata.yaml").read_text()) DATABASE_APP_NAME = METADATA["name"] @@ -100,7 +101,7 @@ async def build_and_deploy( application_name=database_app_name, trust=True, num_units=num_units, - series=CHARM_SERIES, + base=CHARM_BASE, config={"profile": "testing"}, ), ) @@ -277,6 +278,7 @@ async def deploy_and_relate_application_with_postgresql( channel: str = "stable", relation: str = "db", status: str = "blocked", + base: str = CHARM_BASE, ) -> int: """Helper function to deploy and relate application with PostgreSQL. @@ -289,6 +291,7 @@ async def deploy_and_relate_application_with_postgresql( relation: Name of the PostgreSQL relation to relate the application to. status: The status to wait for in the application (default: blocked). + base: The base of the charm to deploy Returns: the id of the created relation. @@ -299,6 +302,7 @@ async def deploy_and_relate_application_with_postgresql( channel=channel, application_name=application_name, num_units=number_of_units, + base=base, ) await ops_test.model.wait_for_idle( apps=[application_name], @@ -837,8 +841,10 @@ async def backup_operations( ) -> None: """Basic set of operations for backup testing in different cloud providers.""" # Deploy S3 Integrator and TLS Certificates Operator. - await ops_test.model.deploy(s3_integrator_app_name) - await ops_test.model.deploy(tls_certificates_app_name, config=tls_config, channel=tls_channel) + await ops_test.model.deploy(s3_integrator_app_name, base=CHARM_BASE) + await ops_test.model.deploy( + tls_certificates_app_name, config=tls_config, channel=tls_channel, base=CHARM_BASE + ) # Deploy and relate PostgreSQL to S3 integrator (one database app for each cloud for now # as archivo_mode is disabled after restoring the backup) and to TLS Certificates Operator # (to be able to create backups from replicas). diff --git a/tests/integration/new_relations/test_new_relations.py b/tests/integration/new_relations/test_new_relations.py index 5f9e218879..61bcbfdaa4 100644 --- a/tests/integration/new_relations/test_new_relations.py +++ b/tests/integration/new_relations/test_new_relations.py @@ -16,7 +16,7 @@ from .. import markers from ..helpers import ( - CHARM_SERIES, + CHARM_BASE, check_database_users_existence, scale_application, ) @@ -56,7 +56,7 @@ async def test_database_relation_with_charm_libraries(ops_test: OpsTest, databas APPLICATION_APP_NAME, application_name=APPLICATION_APP_NAME, num_units=2, - series=CHARM_SERIES, + base=CHARM_BASE, channel="edge", ), ops_test.model.deploy( @@ -68,7 +68,7 @@ async def test_database_relation_with_charm_libraries(ops_test: OpsTest, databas }, application_name=DATABASE_APP_NAME, num_units=3, - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ), @@ -81,7 +81,7 @@ async def test_database_relation_with_charm_libraries(ops_test: OpsTest, databas }, application_name=ANOTHER_DATABASE_APP_NAME, num_units=3, - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ), @@ -196,7 +196,7 @@ async def test_two_applications_doesnt_share_the_same_relation_data(ops_test: Op await ops_test.model.deploy( APPLICATION_APP_NAME, application_name=another_application_app_name, - series=CHARM_SERIES, + base=CHARM_BASE, channel="edge", ) await ops_test.model.wait_for_idle(apps=all_app_names, status="active") @@ -453,7 +453,7 @@ async def test_admin_role(ops_test: OpsTest): all_app_names = [DATA_INTEGRATOR_APP_NAME] all_app_names.extend(APP_NAMES) async with ops_test.fast_forward(): - await ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME) + await ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME, base=CHARM_BASE) await ops_test.model.wait_for_idle(apps=[DATA_INTEGRATOR_APP_NAME], status="blocked") await ops_test.model.applications[DATA_INTEGRATOR_APP_NAME].set_config({ "database-name": DATA_INTEGRATOR_APP_NAME.replace("-", "_"), @@ -542,7 +542,9 @@ async def test_invalid_extra_user_roles(ops_test: OpsTest): another_data_integrator_app_name = f"another-{DATA_INTEGRATOR_APP_NAME}" data_integrator_apps_names = [DATA_INTEGRATOR_APP_NAME, another_data_integrator_app_name] await ops_test.model.deploy( - DATA_INTEGRATOR_APP_NAME, application_name=another_data_integrator_app_name + DATA_INTEGRATOR_APP_NAME, + application_name=another_data_integrator_app_name, + base=CHARM_BASE, ) await ops_test.model.wait_for_idle( apps=[another_data_integrator_app_name], status="blocked" @@ -607,7 +609,7 @@ async def test_database_deploy_clientapps(ops_test: OpsTest, database_charm): }, application_name=DATABASE_APP_NAME, num_units=3, - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ), @@ -628,7 +630,7 @@ async def test_discourse(ops_test: OpsTest): await gather( ops_test.model.deploy(DISCOURSE_APP_NAME, application_name=DISCOURSE_APP_NAME), ops_test.model.deploy( - REDIS_APP_NAME, application_name=REDIS_APP_NAME, channel="latest/edge" + REDIS_APP_NAME, application_name=REDIS_APP_NAME, channel="latest/edge", base=CHARM_BASE ), ) @@ -705,12 +707,17 @@ async def test_indico_datatabase(ops_test: OpsTest) -> None: async with ops_test.fast_forward(fast_interval="30s"): await ops_test.model.deploy( "indico", - channel="stable", + channel="latest/edge", application_name="indico", num_units=1, + series="focal", + ) + await ops_test.model.deploy( + "redis-k8s", channel="stable", application_name="redis-broker", base="ubuntu@20.04" + ) + await ops_test.model.deploy( + "redis-k8s", channel="stable", application_name="redis-cache", base="ubuntu@20.04" ) - await ops_test.model.deploy("redis-k8s", channel="stable", application_name="redis-broker") - await ops_test.model.deploy("redis-k8s", channel="stable", application_name="redis-cache") await asyncio.gather( ops_test.model.relate("redis-broker", "indico:redis-broker"), ops_test.model.relate("redis-cache", "indico:redis-cache"), diff --git a/tests/integration/new_relations/test_relations_coherence.py b/tests/integration/new_relations/test_relations_coherence.py index 4dc301bdd3..aa489473d1 100644 --- a/tests/integration/new_relations/test_relations_coherence.py +++ b/tests/integration/new_relations/test_relations_coherence.py @@ -9,7 +9,7 @@ import pytest from pytest_operator.plugin import OpsTest -from ..helpers import DATABASE_APP_NAME, build_and_deploy +from ..helpers import CHARM_BASE, DATABASE_APP_NAME, build_and_deploy from .helpers import build_connection_string from .test_new_relations import DATA_INTEGRATOR_APP_NAME @@ -30,7 +30,7 @@ async def test_relations(ops_test: OpsTest, database_charm): await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=3000) # Creating first time relation with user role - await ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME) + await ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME, base=CHARM_BASE) await ops_test.model.applications[DATA_INTEGRATOR_APP_NAME].set_config({ "database-name": DATA_INTEGRATOR_APP_NAME.replace("-", "_"), }) diff --git a/tests/integration/relations/test_relations.py b/tests/integration/relations/test_relations.py index ccab3b6f3d..0d33cf38ee 100644 --- a/tests/integration/relations/test_relations.py +++ b/tests/integration/relations/test_relations.py @@ -7,7 +7,7 @@ import pytest from pytest_operator.plugin import OpsTest -from ..helpers import CHARM_SERIES +from ..helpers import CHARM_BASE from ..new_relations.test_new_relations import ( APPLICATION_APP_NAME, DATABASE_APP_METADATA, @@ -34,7 +34,7 @@ async def test_deploy_charms(ops_test: OpsTest, database_charm): APPLICATION_APP_NAME, application_name=APPLICATION_APP_NAME, num_units=1, - series=CHARM_SERIES, + base=CHARM_BASE, channel="edge", ), ops_test.model.deploy( @@ -46,7 +46,7 @@ async def test_deploy_charms(ops_test: OpsTest, database_charm): }, application_name=APP_NAME, num_units=1, - series=CHARM_SERIES, + base=CHARM_BASE, config={ "profile": "testing", "plugin_unaccent_enable": "True", diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index d1dfdec2b9..ea74ab3166 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -14,7 +14,7 @@ from tenacity import Retrying, stop_after_delay, wait_fixed from .helpers import ( - CHARM_SERIES, + CHARM_BASE, METADATA, STORAGE_PATH, build_and_deploy, @@ -388,7 +388,7 @@ async def test_redeploy_charm_same_model(ops_test: OpsTest): }, application_name=APP_NAME, num_units=len(UNIT_IDS), - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ) @@ -432,7 +432,7 @@ async def test_redeploy_charm_same_model_after_forcing_removal(ops_test: OpsTest }, application_name=APP_NAME, num_units=len(UNIT_IDS), - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ) @@ -464,7 +464,7 @@ async def test_storage_with_more_restrictive_permissions(ops_test: OpsTest): }, application_name=app_name, num_units=1, - series=CHARM_SERIES, + base=CHARM_BASE, trust=True, config={"profile": "testing"}, ) diff --git a/tests/integration/test_db.py b/tests/integration/test_db.py index f266174bc5..658aa6b713 100644 --- a/tests/integration/test_db.py +++ b/tests/integration/test_db.py @@ -10,7 +10,7 @@ from . import markers from .helpers import ( APPLICATION_NAME, - CHARM_SERIES, + CHARM_BASE, DATABASE_APP_NAME, build_and_deploy, check_database_creation, @@ -51,7 +51,12 @@ async def test_finos_waltz_db(ops_test: OpsTest) -> None: # Deploy and test the first deployment of Finos Waltz. relation_id = await deploy_and_relate_application_with_postgresql( - ops_test, "finos-waltz-k8s", FINOS_WALTZ_APP_NAME, APPLICATION_UNITS, channel="edge" + ops_test, + "finos-waltz-k8s", + FINOS_WALTZ_APP_NAME, + APPLICATION_UNITS, + channel="edge", + base="ubuntu@20.04", ) await check_database_creation(ops_test, "waltz") @@ -66,6 +71,7 @@ async def test_finos_waltz_db(ops_test: OpsTest) -> None: ANOTHER_FINOS_WALTZ_APP_NAME, APPLICATION_UNITS, channel="edge", + base="ubuntu@20.04", ) # In this case, the database name is the same as in the first deployment # because it's a fixed value in Finos Waltz charm. @@ -107,13 +113,13 @@ async def test_extensions_blocking(ops_test: OpsTest) -> None: await ops_test.model.deploy( APPLICATION_NAME, application_name=APPLICATION_NAME, - series=CHARM_SERIES, + base=CHARM_BASE, channel="edge", ) await ops_test.model.deploy( APPLICATION_NAME, application_name=f"{APPLICATION_NAME}2", - series=CHARM_SERIES, + base=CHARM_BASE, channel="edge", ) diff --git a/tests/integration/test_db_admin.py b/tests/integration/test_db_admin.py index 6d023331d8..8d1a5c94fa 100644 --- a/tests/integration/test_db_admin.py +++ b/tests/integration/test_db_admin.py @@ -30,7 +30,9 @@ async def test_discourse_from_discourse_charmers(ops_test: OpsTest): async with ops_test.fast_forward(): await asyncio.gather( build_and_deploy(ops_test, DATABASE_UNITS), - ops_test.model.deploy(REDIS_APP_NAME, application_name=REDIS_APP_NAME), + ops_test.model.deploy( + REDIS_APP_NAME, application_name=REDIS_APP_NAME, base="ubuntu@20.04" + ), ) await ops_test.model.wait_for_idle( apps=[DATABASE_APP_NAME, REDIS_APP_NAME], status="active", timeout=1500 diff --git a/tests/integration/test_tls.py b/tests/integration/test_tls.py index 0b49d95ea2..5ca5d9f373 100644 --- a/tests/integration/test_tls.py +++ b/tests/integration/test_tls.py @@ -13,6 +13,7 @@ change_patroni_setting, ) from .helpers import ( + CHARM_BASE, DATABASE_APP_NAME, build_and_deploy, check_database_creation, @@ -83,7 +84,7 @@ async def test_tls(ops_test: OpsTest) -> None: async with ops_test.fast_forward(): # Deploy TLS Certificates operator. await ops_test.model.deploy( - tls_certificates_app_name, config=tls_config, channel=tls_channel + tls_certificates_app_name, config=tls_config, channel=tls_channel, base=CHARM_BASE ) # Relate it to the PostgreSQL to enable TLS. await ops_test.model.relate(DATABASE_APP_NAME, tls_certificates_app_name) @@ -191,7 +192,12 @@ async def test_mattermost_db(ops_test: OpsTest) -> None: async with ops_test.fast_forward(): # Deploy and check Mattermost user and database existence. relation_id = await deploy_and_relate_application_with_postgresql( - ops_test, "mattermost-k8s", MATTERMOST_APP_NAME, APPLICATION_UNITS, status="waiting" + ops_test, + "mattermost-k8s", + MATTERMOST_APP_NAME, + APPLICATION_UNITS, + status="waiting", + base="ubuntu@20.04", ) await check_database_creation(ops_test, "mattermost") diff --git a/tests/integration/test_trust.py b/tests/integration/test_trust.py index ca26e03770..8de2491ed8 100644 --- a/tests/integration/test_trust.py +++ b/tests/integration/test_trust.py @@ -10,6 +10,7 @@ from pytest_operator.plugin import OpsTest from .helpers import ( + CHARM_BASE, KUBECTL, METADATA, get_leader_unit, @@ -96,6 +97,7 @@ async def test_deploy_without_trust(ops_test: OpsTest, database_charm): application_name=APP_NAME, num_units=3, trust=False, + base=CHARM_BASE, ) await ops_test.model.block_until( diff --git a/tests/integration/test_wrong_arch.py b/tests/integration/test_wrong_arch.py index 9cfcbcbb45..e05456e7a5 100644 --- a/tests/integration/test_wrong_arch.py +++ b/tests/integration/test_wrong_arch.py @@ -12,7 +12,7 @@ from pytest_operator.plugin import OpsTest from . import markers -from .helpers import CHARM_SERIES, DATABASE_APP_NAME, METADATA +from .helpers import CHARM_BASE, DATABASE_APP_NAME, METADATA logger = logging.getLogger(__name__) @@ -47,7 +47,7 @@ async def test_arm_charm_on_amd_host(ops_test: OpsTest) -> None: application_name=DATABASE_APP_NAME, trust=True, num_units=1, - series=CHARM_SERIES, + base=CHARM_BASE, config={"profile": "testing"}, ) @@ -70,7 +70,7 @@ async def test_amd_charm_on_arm_host(ops_test: OpsTest) -> None: application_name=DATABASE_APP_NAME, trust=True, num_units=1, - series=CHARM_SERIES, + base=CHARM_BASE, config={"profile": "testing"}, )