From 00fd89a5c637a089c69346726b34f0cfbaffbc08 Mon Sep 17 00:00:00 2001
From: Bartlomiej Gmerek <42570669+Gmerold@users.noreply.github.com>
Date: Wed, 18 Dec 2024 09:54:16 +0100
Subject: [PATCH] fix: Uses ubuntu@24.04 in TF module and itests (#391)

---
 terraform/main.tf                     | 1 +
 terraform/variables.tf                | 6 ++++++
 tests/integration/test_integration.py | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/terraform/main.tf b/terraform/main.tf
index e5c1dc5..530e7ad 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -9,6 +9,7 @@ resource "juju_application" "pcf" {
     name     = "sdcore-pcf-k8s"
     channel  = var.channel
     revision = var.revision
+    base     = var.base
   }
 
   config      = var.config
diff --git a/terraform/variables.tf b/terraform/variables.tf
index be85729..924d971 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 52d6ed9..5a578c5 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"
 
 
 @pytest.fixture(scope="module")
@@ -154,6 +155,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
@@ -174,6 +176,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)