diff --git a/terraform/main.tf b/terraform/main.tf index 38d4d7e..9298f4b 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -9,6 +9,7 @@ resource "juju_application" "ausf" { name = "sdcore-ausf-k8s" channel = var.channel revision = var.revision + base = var.base } config = var.config diff --git a/terraform/variables.tf b/terraform/variables.tf index 4fc0386..624f95c 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 28ffbb0..da59c07 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -27,6 +27,7 @@ TLS_PROVIDER_CHANNEL = "latest/stable" GRAFANA_AGENT_CHARM_NAME = "grafana-agent-k8s" GRAFANA_AGENT_CHARM_CHANNEL = "latest/stable" +SDCORE_CHARMS_SERIES = "noble" TIMEOUT = 15 * 60 @@ -151,6 +152,7 @@ async def _deploy_nrf(ops_test: OpsTest): NRF_APPLICATION_NAME, application_name=NRF_APPLICATION_NAME, channel=NRF_APPLICATION_CHANNEL, + series=SDCORE_CHARMS_SERIES, # TODO: This should be replaced with base="ubuntu@24.04" once it's properly supported # noqa: E501 ) await ops_test.model.integrate(relation1=DB_APPLICATION_NAME, relation2=NRF_APPLICATION_NAME) await ops_test.model.integrate(relation1=NRF_APPLICATION_NAME, relation2=TLS_PROVIDER_NAME) @@ -166,6 +168,7 @@ async def _deploy_nms(ops_test: OpsTest): NMS_APPLICATION_NAME, application_name=NMS_APPLICATION_NAME, channel=NMS_APPLICATION_CHANNEL, + series=SDCORE_CHARMS_SERIES, # TODO: This should be replaced with base="ubuntu@24.04" once it's properly supported # noqa: E501 ) await ops_test.model.integrate( relation1=f"{NMS_APPLICATION_NAME}:common_database", relation2=DB_APPLICATION_NAME