diff --git a/src/charm.py b/src/charm.py index 7643aeb..1e142ab 100755 --- a/src/charm.py +++ b/src/charm.py @@ -405,8 +405,8 @@ def _on_set_partition_info_on_app_relation_data(self, event): if self._slurmd.is_joined: if partition := { "partition_name": self.app.name, - "partition_state": self.config.get("partition-config"), - "partition_config": self.config.get("partition-state"), + "partition_config": self.config.get("partition-config"), + "partition_state": self.config.get("partition-state"), }: self._slurmd.set_partition_info_on_app_relation_data(partition) else: diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py index b59eceb..15aebe8 100644 --- a/tests/integration/helpers.py +++ b/tests/integration/helpers.py @@ -16,40 +16,23 @@ import logging import pathlib -import shlex import subprocess from typing import Dict from urllib import request -from pylxd import Client - logger = logging.getLogger(__name__) ETCD = "etcd-v3.5.0-linux-amd64.tar.gz" ETCD_URL = f"https://github.com/etcd-io/etcd/releases/download/v3.5.0/{ETCD}" NHC = "lbnl-nhc-1.4.3.tar.gz" NHC_URL = f"https://github.com/mej/nhc/releases/download/1.4.3/{NHC}" +OVERLAY = "overlay.yaml" VERSION = "version" VERSION_NUM = subprocess.run( - shlex.split("git describe --always"), stdout=subprocess.PIPE, text=True + ["git", "describe", "--always"], stdout=subprocess.PIPE, text=True ).stdout.strip("\n") -def modify_default_profile() -> None: - """Modify the default LXD profile. - - Notes: - The default profile needs to be modified so that slurmd can - use proctrack/cgroup for process tracking inside an LXD container. - """ - client = Client() - config = {"security.nesting": "true"} - logger.info(f"Updating default LXD profile configuration to {config}") - default = client.profiles.get("default") - default.config.update(config) - default.save() - - def get_slurmctld_res() -> Dict[str, pathlib.Path]: """Get slurmctld resources needed for charm deployment.""" if not (version := pathlib.Path(VERSION)).exists(): diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index 61c3761..8223e58 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -21,7 +21,7 @@ from typing import Any, Coroutine import pytest -from helpers import get_slurmctld_res, get_slurmd_res, modify_default_profile +from helpers import get_slurmctld_res, get_slurmd_res from pytest_operator.plugin import OpsTest logger = logging.getLogger(__name__) @@ -41,13 +41,13 @@ async def test_build_and_deploy( ) -> None: """Test that the slurmd charm can stabilize against slurmctld, slurmdbd and MySQL.""" logger.info(f"Deploying {SLURMD} against {SLURMCTLD}, {SLURMDBD}, and {DATABASE}") - modify_default_profile() res_slurmd = get_slurmd_res() res_slurmctld = get_slurmctld_res() await asyncio.gather( ops_test.model.deploy( SLURMCTLD, application_name=SLURMCTLD, + config={"proctrack-type": "proctrack/linuxproc"}, channel="edge", num_units=1, resources=res_slurmctld,