diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd3dff436262354f71a3c3daa72dab1f1b302a77..dc8420e8d66fdcce8d9d0207fa0a3e89249dcd07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -include: 'https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/basic.yml' +include: 'https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/refactored.yml' stages: - build diff --git a/.nix/default.nix b/default.nix similarity index 89% rename from .nix/default.nix rename to default.nix index 08f56aa622c052389ef61f8458e3eb769528e97f..6fa0ef80e816eb1dce89d848c4f791b5cbd31883 100644 --- a/.nix/default.nix +++ b/default.nix @@ -2,6 +2,6 @@ let argotest = builtins.fetchTarball "https://xgitlab.cels.anl.gov/argo/argotest/-/archive/master/argotest-master.tar.gz"; in import "${argotest}/test.nix" { - nrm-override = ./..; + nrm-override = ./.; testName = "traceback"; } diff --git a/nrm/containers.py b/nrm/containers.py index 7532e62cc740c32228aeb5926537f4cedf3b3b1f..475f17806fd1fb57fb42d2bb9accd502d171f5e3 100644 --- a/nrm/containers.py +++ b/nrm/containers.py @@ -70,12 +70,12 @@ class ContainerManager(object): # Check if container exists else create it if container_name in self.containers: - container = self.containers[container_name] - containerexistsflag = True - processes = container.processes - clientids = container.clientids - hwbindings = container.hwbindings - bind_index = len(processes) + container = self.containers[container_name] + containerexistsflag = True + processes = container.processes + clientids = container.clientids + hwbindings = container.hwbindings + bind_index = len(processes) else: processes = dict() clientids = dict() @@ -114,16 +114,16 @@ class ContainerManager(object): if hasattr(manifest.app.isolators, 'power'): if hasattr(manifest.app.isolators.power, 'enabled'): - pp = manifest.app.isolators.power - if pp.enabled in ["1", "True"]: - if pp.profile in ["1", "True"]: - container_power['profile'] = dict() - container_power['profile']['start'] = dict() - container_power['profile']['end'] = dict() - if pp.policy != "NONE": - container_power['policy'] = pp.policy - container_power['damper'] = pp.damper - container_power['slowdown'] = pp.slowdown + pp = manifest.app.isolators.power + if pp.enabled in ["1", "True"]: + if pp.profile in ["1", "True"]: + container_power['profile'] = dict() + container_power['profile']['start'] = dict() + container_power['profile']['end'] = dict() + if pp.policy != "NONE": + container_power['policy'] = pp.policy + container_power['damper'] = pp.damper + container_power['slowdown'] = pp.slowdown # Compute hardware bindings if hasattr(manifest.app.isolators, 'hwbind'):