From 1b185d330a4f3e41c4f054c9a0eb62d439a9eb50 Mon Sep 17 00:00:00 2001 From: Patricia Reinoso Date: Wed, 18 Dec 2024 10:23:35 +0100 Subject: [PATCH 1/2] fix: use noble in TF module --- terraform/main.tf | 1 + terraform/variables.tf | 6 ++++++ tests/integration/test_integration.py | 2 ++ 3 files changed, 9 insertions(+) diff --git a/terraform/main.tf b/terraform/main.tf index 41cbc45..6443661 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -9,6 +9,7 @@ resource "juju_application" "nrf" { name = "sdcore-nrf-k8s" channel = var.channel revision = var.revision + base = var.base } config = var.config diff --git a/terraform/variables.tf b/terraform/variables.tf index 9fe4c2c..9334318 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 30d5a56..6a4bf66 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -24,6 +24,7 @@ TLS_CHARM_CHANNEL = "latest/stable" GRAFANA_AGENT_CHARM_NAME = "grafana-agent-k8s" GRAFANA_AGENT_CHARM_CHANNEL = "latest/stable" +SDCORE_CHARMS_BASE = "ubuntu@24.04" TIMEOUT = 15 * 60 @@ -161,6 +162,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=DB_CHARM_NAME From 819a44dad21a6aeab06b53300fafd2e4bf156c5d Mon Sep 17 00:00:00 2001 From: Patricia Reinoso Date: Wed, 18 Dec 2024 15:21:32 +0100 Subject: [PATCH 2/2] replace base with series --- tests/integration/test_integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 6a4bf66..3312e3b 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -24,7 +24,7 @@ TLS_CHARM_CHANNEL = "latest/stable" GRAFANA_AGENT_CHARM_NAME = "grafana-agent-k8s" GRAFANA_AGENT_CHARM_CHANNEL = "latest/stable" -SDCORE_CHARMS_BASE = "ubuntu@24.04" +SDCORE_CHARMS_SERIES = "noble" TIMEOUT = 15 * 60 @@ -162,7 +162,7 @@ async def _deploy_nms(ops_test: OpsTest): NMS_CHARM_NAME, application_name=NMS_CHARM_NAME, channel=NMS_CHARM_CHANNEL, - base=SDCORE_CHARMS_BASE, + 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_CHARM_NAME}:common_database", relation2=DB_CHARM_NAME