src/mpsd_software_manager/mpsd_software.py

@@ -1086,33 +1086,73 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
         f" with package_sets {package_sets} from {root_dir}"
     )
     logging.warning(msg)
+    # Handle 3 situations :
+    # 1. remove dosent specify what to remove  -> warn and exit
+    # 2. remove all package_sets from release -> remove release folder except logs
+    # 3. remove specific package_sets from release
+    #       -> remove spack environments via spack commands
+
     if package_sets == "NONE":
         logging.warning(
             "Please specify package_sets to remove, or 'ALL' to remove all toolchains"
         )
-        sys.exit(1)
+        sys.exit(50)  # TODO document this code.
+    # 2nd case: remove the entire release for microarchitecture
+    dir_to_remove = root_dir / mpsd_release / get_native_microarchitecture()
     if "ALL" in package_sets:
         # we need to remove the entire release folder
         logging.warning(
-            f"Removing release {mpsd_release} from {root_dir}"
-            "do you want to continue? [y/n]"
+            f"Removing release {mpsd_release}"
+            f"from {root_dir} for {get_native_microarchitecture()}"
         )
-        if force_remove or input().lower() == "y":
-            folders_to_remove = os.listdir(root_dir / mpsd_release)
-            # skip logs folder
-            if "logs" in folders_to_remove:
-                folders_to_remove.remove("logs")
-            for folder in folders_to_remove:
-                shutil.rmtree(root_dir / mpsd_release / folder)
-                sys.exit(0)
+        if not force_remove:
+            logging.warning("do you want to continue? [y/n]")
+            if input().lower() != "y":
+                sys.exit(60)  # TODO document this code.
+
+        folders_to_remove = os.listdir(dir_to_remove)
+        # skip logs folder
+        # if "logs" in folders_to_remove:
+        #     folders_to_remove.remove("logs")
+        for folder in folders_to_remove:
+            shutil.rmtree(dir_to_remove / folder)
+        logging.warning(f"Removed release {mpsd_release} from {root_dir}")
+        return
+    # 3rd case: remove specific package_sets from release
     for package_set in package_sets:
         # we load the spack environment and remove the package_set
-        spack_env = ""
-        commands_to_execute = [
-            f"source {spack_env}",
-            f"spack env remove -y {package_set}",
-        ]
-        run(" && ".join(commands_to_execute), shell=True, check=True)
+        if package_set not in ["global_packages", "global"]:
+            remove_spack_environment(dir_to_remove / "spack", package_set)
+        else:
+            # TODO remove global packages by calling remove_spack_package
+            pass
+
+
+def remove_spack_environment(spack_dir, environment_name):
+    """Remove spack environment."""
+    logging.warning(f"Removing spack environment {environment_name}")
+    spack_env = spack_dir / "share" / "spack" / "setup-env.sh"
+    commands_to_execute = [
+        f"source {spack_env}",
+        f"spack env activate {environment_name}",
+        f"for spec in $(spack -e {environment_name} find"  # this line continues
+        r' --format "{name}@{version}%{compiler.name}@{compiler.version}");do'
+        " spack uninstall -y $spec; done",
+        "spack env deactivate",
+        f"spack env remove -y {environment_name}",
+    ]
+    run(" && ".join(commands_to_execute), shell=True, check=True)
+
+
+def remove_spack_package(spack_dir, package):
+    """Remove spack package."""
+    logging.info(f"Removing spack package {package}")
+    spack_env = spack_dir / "share" / "spack" / "setup-env.sh"
+    commands_to_execute = [
+        f"source {spack_env}",
+        f"spack uninstall -y {package}",
+    ]
+    run(" && ".join(commands_to_execute), shell=True, check=True)
 
 
 def start_new_environment(release, from_release, target_dir):
@@ -1315,7 +1355,7 @@ def main():
         ("available", "What is available for installation?"),
         ("install", "Install a software environment"),
         # ("reinstall", "Reinstall a package_set"),
-        # ("remove", "Remove a package set"),
+        ("remove", "Remove a package set"),
         # ("start-new", "Start a new MPSD software release version"),
         ("status", "Show status: what is installed?"),
         ("prepare", "Prepare installation of MPSD-release (dev only)"),

tests/test_mpsd_software.py

@@ -509,7 +509,6 @@ def test_environment_status(tmp_path):
         assert set(toolchain_map[microarch]) == set(expected_toolchain_map[microarch])
 
 
-@pytest.mark.skip(reason="not implemented yet")
 def test_remove_environment(tmp_path):
     """Test that the remove_environment works as expected."""
     mpsd_release = "dev-23a"
@@ -521,15 +520,18 @@ def test_remove_environment(tmp_path):
 
     # test removal  without arguments (should sys.exit(1))
     create_fake_environment(tmp_path, mpsd_release)
-    with pytest.raises(SystemExit):
+    with pytest.raises(SystemExit) as pytest_wrapped_e:
         mod.remove_environment(mpsd_release, tmp_path, force_remove=True)
+    assert pytest_wrapped_e.type == SystemExit
+    assert pytest_wrapped_e.value.code == 1
 
     # test removal of the complete environment
+    create_fake_environment(tmp_path, mpsd_release)
     mod.remove_environment(mpsd_release, tmp_path, ["ALL"], force_remove=True)
     toolchain_map = mod.environment_status(mpsd_release, tmp_path)
     assert toolchain_map is None
     # ensure that logs folder remains
-    logs_folder = tmp_path / mpsd_release / "logs"
+    logs_folder = tmp_path / mpsd_release / mod.get_native_microarchitecture() / "logs"
     assert logs_folder.exists()
 
     # test removal of a single toolchain