Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use [email protected] in TF modules #384

Merged
merged 2 commits into from
Dec 18, 2024
Merged

fix: use [email protected] in TF modules #384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e59665d
fix: use noble in TF module
patriciareinoso Dec 17, 2024
cea149b
use series instead of base
patriciareinoso Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ resource "juju_application" "gnbsim" {
name = "sdcore-gnbsim-k8s"
channel = var.channel
revision = var.revision
base = var.base
}

config = var.config
Expand Down
6 changes: 6 additions & 0 deletions terraform/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ variable "revision" {
default = null
}

variable "base" {
description = "The operating system on which to deploy"
type = string
default = "[email protected]"
}

variable "units" {
description = "Number of units to deploy"
type = number
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
TLS_CHARM_CHANNEL = "latest/stable"
GRAFANA_AGENT_CHARM_NAME = "grafana-agent-k8s"
GRAFANA_AGENT_CHARM_CHANNEL = "latest/stable"
SDCORE_CHARMS_BASE = "[email protected]"
TIMEOUT = 5 * 60


Expand Down Expand Up @@ -99,6 +100,7 @@ async def _deploy_amf(ops_test: OpsTest):
AMF_CHARM_NAME,
application_name=AMF_CHARM_NAME,
channel=AMF_CHARM_CHANNEL,
base=SDCORE_CHARMS_BASE,
trust=True,
)
await ops_test.model.integrate(relation1=AMF_CHARM_NAME, relation2=NRF_CHARM_NAME)
Expand Down Expand Up @@ -140,6 +142,7 @@ async def _deploy_nrf(ops_test: OpsTest):
NRF_CHARM_NAME,
application_name=NRF_CHARM_NAME,
channel=NRF_CHARM_CHANNEL,
base=SDCORE_CHARMS_BASE,
trust=True,
)
await ops_test.model.integrate(relation1=NRF_CHARM_NAME, relation2=DB_CHARM_NAME)
Expand All @@ -153,6 +156,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=f"{DB_CHARM_NAME}"
Expand Down
Loading