MK8S-25: Simplify cleanup by placing saltenv directory at repository level

Move saltenv directory structure to be alongside repository directories
where it gets cleaned up automatically by existing repository cleanup,
eliminating the need for complex multi-level directory cleanup coordination.

Changes:
- Move saltenv dir from `/packages/redhat/metalk8s-VERSION/` to `/packages/redhat/8/metalk8s-VERSION/`
- Create top-level saltenv dir `/packages/metalk8s-VERSION/` for health check
- Remove complex cleanup functions from packaging.py directory tasks
- Use repository's existing cleanup mechanisms

This ensures all index.html files are removed with existing cleanup flows,
preventing directory removal failures that blocked e2e tests.

Author: rdebay-scality

buildchain/buildchain/packaging.py

@@ -150,27 +150,11 @@ def task__package_mkdir_iso_root() -> types.TaskDict:
 
 def task__package_mkdir_redhat_iso_root() -> types.TaskDict:
     """Create the RedHat packages root directory on the ISO."""
-
-    def clean() -> None:
-        """Clean RedHat directory including saltenv directory structure."""
-        # Remove saltenv directory structure created by repository index files
-        saltenv_dir = (
-            constants.REPO_REDHAT_ROOT
-            / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
-        )
-        if saltenv_dir.exists():
-            coreutils.rm_rf(saltenv_dir)
-
-    mkdir_task = targets.Mkdir(
+    return targets.Mkdir(
         directory=constants.REPO_REDHAT_ROOT,
         task_dep=["_package_mkdir_iso_root"],
     ).task
 
-    # Add our custom cleanup function
-    mkdir_task["clean"] = [clean]
-
-    return mkdir_task
-
 
 def _package_mkdir_redhat_release_iso_root(releasever: str) -> types.TaskDict:
     """

buildchain/buildchain/targets/repository.py

@@ -219,15 +219,25 @@ def clean() -> None:
             ]
             # Clean shared directory index files if this is scality repo
             if self.name == "scality":
+                # Saltenv directory at repository level (cleaner for cleanup)
                 saltenv_dir = (
+                    self._repo_root
+                    / self._releasever
+                    / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
+                )
+                # Top-level saltenv directory (needed for health check)
+                top_saltenv_dir = (
                     self._repo_root
                     / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
                 )
                 index_files.extend(
                     [
+                        # Repository-level saltenv structure
                         saltenv_dir / "index.html",
                         saltenv_dir / "redhat" / "index.html",
                         saltenv_dir / "redhat" / str(self._releasever) / "index.html",
+                        # Top-level saltenv (for health check)
+                        top_saltenv_dir / "index.html",
                     ]
                 )
 
@@ -245,15 +255,25 @@ def create_index() -> None:
             # Also create shared directory index files, but only from scality repo
             # to avoid doit task conflicts between multiple repositories
             if self.name == "scality":
+                # Saltenv directory at repository level (cleaner for cleanup)
                 saltenv_dir = (
+                    self._repo_root
+                    / self._releasever
+                    / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
+                )
+                # Top-level saltenv directory (needed for health check)
+                top_saltenv_dir = (
                     self._repo_root
                     / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
                 )
                 repository_directories.extend(
                     [
-                        saltenv_dir,  # /{saltenv}/ (needed for health check)
+                        # Repository-level saltenv structure
+                        saltenv_dir,
                         saltenv_dir / "redhat",
                         saltenv_dir / "redhat" / str(self._releasever),
+                        # Top-level saltenv (for health check)
+                        top_saltenv_dir,
                     ]
                 )
 
@@ -271,14 +291,24 @@ def create_index() -> None:
             self.rootdir / self.ARCH / "index.html",
         ]
         if self.name == "scality":
+            # Saltenv directory at repository level (cleaner for cleanup)
             saltenv_dir = (
+                self._repo_root
+                / self._releasever
+                / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
+            )
+            # Top-level saltenv directory (needed for health check)
+            top_saltenv_dir = (
                 self._repo_root / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
             )
             targets.extend(
                 [
+                    # Repository-level saltenv structure
                     saltenv_dir / "index.html",
                     saltenv_dir / "redhat" / "index.html",
                     saltenv_dir / "redhat" / str(self._releasever) / "index.html",
+                    # Top-level saltenv (for health check)
+                    top_saltenv_dir / "index.html",
                 ]
             )