refactor: reorganize E2E tasks module by deployment target

- Create container/ and virtual_machine/ submodules for better architecture separation
- Move provision_docker_infrastructure to container/provision_docker_infrastructure
- Move provision_infrastructure and cleanup_infrastructure to virtual_machine/
- Extract preflight_cleanup into modular structure:
  - Common directory cleanup functions in preflight_cleanup_common
  - Container-specific preflight cleanup in container/preflight_cleanup
  - VM-specific preflight cleanup in virtual_machine/preflight_cleanup
- Maintain backward compatibility through re-exports in preflight_cleanup
- Update all imports across E2E test binaries to use new module structure

Author: josecelano

src/bin/e2e_config_tests.rs

@@ -63,8 +63,8 @@ use torrust_tracker_deploy::e2e::containers::{
     RunningProvisionedContainer, StoppedProvisionedContainer,
 };
 use torrust_tracker_deploy::e2e::environment::TestEnvironment;
+use torrust_tracker_deploy::e2e::tasks::container::provision_docker_infrastructure::provision_docker_infrastructure;
 use torrust_tracker_deploy::e2e::tasks::preflight_cleanup;
-use torrust_tracker_deploy::e2e::tasks::provision_docker_infrastructure::provision_docker_infrastructure;
 use torrust_tracker_deploy::logging::{self, LogFormat};
 
 #[derive(Parser)]

src/bin/e2e_provision_tests.rs

@@ -25,8 +25,11 @@ use tracing::{error, info};
 use torrust_tracker_deploy::config::InstanceName;
 use torrust_tracker_deploy::e2e::environment::TestEnvironment;
 use torrust_tracker_deploy::e2e::tasks::{
-    cleanup_infrastructure::cleanup_infrastructure, preflight_cleanup::cleanup_lingering_resources,
-    provision_infrastructure::provision_infrastructure,
+    preflight_cleanup::cleanup_lingering_resources,
+    virtual_machine::{
+        cleanup_infrastructure::cleanup_infrastructure,
+        provision_infrastructure::provision_infrastructure,
+    },
 };
 use torrust_tracker_deploy::logging::{self, LogFormat};
 

src/bin/e2e_tests_full.rs

@@ -30,10 +30,13 @@ use tracing::{error, info};
 use torrust_tracker_deploy::config::InstanceName;
 use torrust_tracker_deploy::e2e::environment::TestEnvironment;
 use torrust_tracker_deploy::e2e::tasks::{
-    cleanup_infrastructure::cleanup_infrastructure,
     configure_infrastructure::configure_infrastructure,
     preflight_cleanup::cleanup_lingering_resources,
-    provision_infrastructure::provision_infrastructure, validate_deployment::validate_deployment,
+    validate_deployment::validate_deployment,
+    virtual_machine::{
+        cleanup_infrastructure::cleanup_infrastructure,
+        provision_infrastructure::provision_infrastructure,
+    },
 };
 use torrust_tracker_deploy::logging::{self, LogFormat};
 

src/e2e/tasks/container/mod.rs

@@ -0,0 +1,9 @@
+//! Container-specific E2E tasks
+//!
+//! This module contains tasks that are specifically designed for container-based
+//! E2E testing using Docker containers instead of VMs. These tasks handle the
+//! unique requirements and workflows when using testcontainers for testing
+//! infrastructure deployment.
+
+pub mod preflight_cleanup;
+pub mod provision_docker_infrastructure;

src/e2e/tasks/container/preflight_cleanup.rs

@@ -0,0 +1,56 @@
+//! Container-specific preflight cleanup functionality
+//!
+//! This module provides preflight cleanup functionality specifically designed
+//! for Docker container-based E2E testing. Since containers are managed by
+//! testcontainers and automatically cleaned up, this module only handles
+//! directory cleanup operations.
+
+use crate::e2e::environment::TestEnvironment;
+use crate::e2e::tasks::preflight_cleanup::PreflightCleanupError;
+use crate::e2e::tasks::preflight_cleanup_common::{
+    cleanup_build_directory, cleanup_templates_directory,
+};
+use tracing::info;
+
+/// Performs pre-flight cleanup for Docker-based E2E tests
+///
+/// This function is specifically designed for Docker-based E2E tests that use
+/// testcontainers for container lifecycle management. It only cleans directories
+/// since Docker containers are automatically cleaned up when testcontainer objects
+/// are dropped.
+///
+/// # Arguments
+///
+/// * `env` - The test environment containing configuration and services
+///
+/// # Returns
+///
+/// Returns `Ok(())` if cleanup succeeds or if there were no resources to clean up.
+///
+/// # Errors
+///
+/// Returns an error if directory cleanup fails and would prevent new test runs.
+pub fn cleanup_lingering_resources_docker(
+    env: &TestEnvironment,
+) -> Result<(), PreflightCleanupError> {
+    info!(
+        operation = "preflight_cleanup_docker",
+        "Starting pre-flight cleanup for Docker-based E2E tests"
+    );
+
+    // Clean the build directory to ensure fresh template state for E2E tests
+    cleanup_build_directory(env)?;
+
+    // Clean the templates directory to ensure fresh embedded template extraction for E2E tests
+    cleanup_templates_directory(env)?;
+
+    // Note: Docker containers are automatically cleaned up by testcontainers when objects are dropped
+    // No need for explicit container cleanup like with LXD/OpenTofu
+
+    info!(
+        operation = "preflight_cleanup_docker",
+        status = "success",
+        "Pre-flight cleanup for Docker-based E2E tests completed successfully"
+    );
+    Ok(())
+}

…tasks/provision_docker_infrastructure.rs …ainer/provision_docker_infrastructure.rssrc/e2e/tasks/provision_docker_infrastructure.rs renamed to src/e2e/tasks/container/provision_docker_infrastructure.rs src/e2e/tasks/provision_docker_infrastructure.rs renamed to src/e2e/tasks/container/provision_docker_infrastructure.rs

@@ -4,25 +4,37 @@
 //! workflow. Each task represents a significant phase in the deployment testing process
 //! and can be executed independently or as part of a complete test sequence.
 //!
-//! ## Available Tasks
+//! ## Module Organization
 //!
+//! The tasks are organized by deployment target:
+//!
+//! ### Infrastructure-agnostic tasks (can be used with both containers and VMs):
 //! - `clean_and_prepare_templates` - Template cleanup and preparation
-//! - `cleanup_infrastructure` - Infrastructure resource cleanup
-//! - `configure_infrastructure` - Infrastructure configuration via Ansible
-//! - `preflight_cleanup` - Pre-test cleanup of lingering resources
-//! - `provision_infrastructure` - Infrastructure provisioning via `OpenTofu`
-//! - `provision_docker_infrastructure` - Docker container provisioning simulation
+//! - `configure_infrastructure` - Infrastructure configuration via Ansible  
 //! - `setup_ssh_key` - SSH key generation and setup
 //! - `validate_deployment` - Deployment validation and testing
 //!
-//! These tasks are orchestrated by the E2E test binary to provide comprehensive
+//! ### Container-specific tasks (`container` submodule):
+//! - `provision_docker_infrastructure` - Docker container provisioning simulation
+//! - `preflight_cleanup` - Container-specific preflight cleanup
+//!
+//! ### Virtual machine-specific tasks (`virtual_machine` submodule):
+//! - `provision_infrastructure` - Infrastructure provisioning via `OpenTofu`
+//! - `cleanup_infrastructure` - Infrastructure resource cleanup  
+//! - `preflight_cleanup` - VM-specific preflight cleanup (`OpenTofu` + LXD)
+//!
+//! ### Common functionality:
+//! - `preflight_cleanup_common` - Shared directory cleanup functions
+//! - `preflight_cleanup` - Legacy module with common error types and functions
+//!
+//! These tasks are orchestrated by the E2E test binaries to provide comprehensive
 //! testing coverage of the entire deployment system.
 
 pub mod clean_and_prepare_templates;
-pub mod cleanup_infrastructure;
 pub mod configure_infrastructure;
+pub mod container;
 pub mod preflight_cleanup;
-pub mod provision_docker_infrastructure;
-pub mod provision_infrastructure;
+pub mod preflight_cleanup_common;
 pub mod setup_ssh_key;
 pub mod validate_deployment;
+pub mod virtual_machine;