diff --git a/terraform/main.tf b/terraform/main.tf index e579c69..7a0c0fc 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -9,6 +9,7 @@ resource "juju_application" "udr" { name = "sdcore-udr-k8s" channel = var.channel revision = var.revision + base = var.base } config = var.config diff --git a/terraform/variables.tf b/terraform/variables.tf index a76a393..c856082 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -43,6 +43,12 @@ variable "revision" { default = null } +variable "base" { + description = "The operating system on which to deploy" + type = string + default = "ubuntu@24.04" +} + variable "units" { description = "Number of units to deploy" type = number diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 000af60..1bb004a 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -28,6 +28,7 @@ AUTH_DATABASE_RELATION_NAME = "auth_database" NRF_RELATION_NAME = "fiveg_nrf" TLS_RELATION_NAME = "certificates" +SDCORE_CHARMS_BASE = "ubuntu@24.04" class TestUDROperatorCharm: @@ -189,6 +190,7 @@ async def _deploy_nrf(ops_test: OpsTest): application_name=NRF_CHARM_NAME, channel=NRF_CHARM_CHANNEL, trust=True, + base=SDCORE_CHARMS_BASE, ) await ops_test.model.integrate(relation1=NRF_CHARM_NAME, relation2=DATABASE_CHARM_NAME) await ops_test.model.integrate(relation1=NRF_CHARM_NAME, relation2=TLS_CHARM_NAME) @@ -201,6 +203,7 @@ async def _deploy_nms(ops_test: OpsTest): NMS_CHARM_NAME, application_name=NMS_CHARM_NAME, channel=NMS_CHARM_CHANNEL, + base=SDCORE_CHARMS_BASE, ) await ops_test.model.integrate( relation1=f"{NMS_CHARM_NAME}:common_database", relation2=DATABASE_CHARM_NAME