refactor: consolidate Docker container E2E functions into run_provision_simulation

- Move setup_docker_container, provision_docker_infrastructure, and configure_ssh_connectivity functions into run_provision_simulation.rs
- Rename functions for better clarity: setup_docker_container → create_and_start_container, provision_docker_infrastructure → render_ansible_configuration, configure_ssh_connectivity → establish_ssh_connectivity
- Update all E2E test binaries to use consolidated function structure and renamed functions
- Fix doctest import to reference correct cleanup_infrastructure function name
- Remove dedicated function files and update module declarations
- Consolidate preflight_cleanup function naming to use shared cleanup_lingering_resources
- All tests passing with improved code organization and clearer function names

Author: josecelano

src/bin/e2e_config_tests.rs

@@ -47,19 +47,17 @@
 use anyhow::Result;
 use clap::Parser;
 use std::time::Instant;
+use torrust_tracker_deploy::e2e::tasks::run_configure_command::run_configure_command;
 use tracing::{error, info};
 
 use torrust_tracker_deploy::config::InstanceName;
 use torrust_tracker_deploy::e2e::environment::{TestEnvironment, TestEnvironmentType};
 use torrust_tracker_deploy::e2e::tasks::{
     container::{
-        cleanup_infrastructure::cleanup_docker_container,
-        configure_ssh_connectivity::configure_ssh_connectivity,
+        cleanup_infrastructure::cleanup_infrastructure,
         run_provision_simulation::run_provision_simulation,
-        setup_docker_container::setup_docker_container,
     },
     preflight_cleanup,
-    run_configure_command::run_ansible_configuration,
     run_deployment_validation::run_deployment_validation,
 };
 use torrust_tracker_deploy::logging::{self, LogFormat};
@@ -124,7 +122,7 @@ pub async fn main() -> Result<()> {
         TestEnvironmentType::Container,
     )?;
 
-    preflight_cleanup::cleanup_lingering_resources_docker(&env)?;
+    preflight_cleanup::cleanup_lingering_resources(&env)?;
 
     let test_result = run_configuration_tests(&env).await;
 
@@ -163,30 +161,20 @@ pub async fn main() -> Result<()> {
 async fn run_configuration_tests(test_env: &TestEnvironment) -> Result<()> {
     info!("Starting configuration tests with Docker container");
 
-    // Step 1: Setup Docker container
-    let running_container = setup_docker_container().await?;
-    let socket_addr = running_container.ssh_socket_addr();
-
-    // Step 2: Configure SSH connectivity
-    configure_ssh_connectivity(
-        socket_addr,
-        &test_env.config.ssh_credentials,
-        Some(&running_container),
-    )
-    .await?;
-
-    // Step 3: Run provision simulation
-    run_provision_simulation(socket_addr, &test_env.config.ssh_credentials, test_env).await?;
+    // Step 1: Run provision simulation (includes container setup and SSH connectivity)
+    let running_container = run_provision_simulation(test_env).await?;
 
-    // Step 4: Run Ansible configuration (expect failure due to inventory mismatch)
-    run_ansible_configuration(socket_addr, test_env, false)?;
+    // Step 2: Run Ansible configuration
+    run_configure_command(test_env)?;
 
-    // Step 5: Run deployment validation
+    // Step 3: Run deployment validation
+    let socket_addr = running_container.ssh_socket_addr();
     run_deployment_validation(socket_addr, &test_env.config.ssh_credentials).await?;
 
-    // Step 6: Cleanup container
-    cleanup_docker_container(running_container);
+    // Step 4: Cleanup container
+    cleanup_infrastructure(running_container);
 
     info!("Configuration tests completed successfully");
+
     Ok(())
 }

src/bin/e2e_provision_tests.rs

@@ -28,7 +28,7 @@ use torrust_tracker_deploy::e2e::tasks::{
     preflight_cleanup::cleanup_lingering_resources,
     virtual_machine::{
         cleanup_infrastructure::cleanup_infrastructure,
-        run_provision_command::provision_infrastructure,
+        run_provision_command::run_provision_command,
     },
 };
 use torrust_tracker_deploy::logging::{self, LogFormat};
@@ -158,7 +158,7 @@ async fn run_provisioning_test(env: &TestEnvironment) -> Result<IpAddr> {
         "Starting infrastructure provisioning E2E test"
     );
 
-    let instance_ip = provision_infrastructure(env).await?;
+    let instance_ip = run_provision_command(env).await?;
 
     info!(
         status = "success",

src/bin/e2e_tests_full.rs

@@ -31,11 +31,11 @@ use torrust_tracker_deploy::config::InstanceName;
 use torrust_tracker_deploy::e2e::environment::TestEnvironment;
 use torrust_tracker_deploy::e2e::tasks::{
     preflight_cleanup::cleanup_lingering_resources,
-    run_configure_command::configure_infrastructure,
-    run_test_command::validate_deployment,
+    run_configure_command::run_configure_command,
+    run_test_command::run_test_command,
     virtual_machine::{
         cleanup_infrastructure::cleanup_infrastructure,
-        run_provision_command::provision_infrastructure,
+        run_provision_command::run_provision_command,
     },
 };
 use torrust_tracker_deploy::logging::{self, LogFormat};
@@ -107,7 +107,7 @@ pub async fn main() -> Result<()> {
     let deployment_result = run_full_deployment_test(&env).await;
 
     let validation_result = match &deployment_result {
-        Ok(instance_ip) => validate_deployment(&env, instance_ip).await,
+        Ok(instance_ip) => run_test_command(&env, instance_ip).await,
         Err(_) => Ok(()), // Skip validation if deployment failed
     };
 
@@ -169,9 +169,9 @@ async fn run_full_deployment_test(env: &TestEnvironment) -> Result<IpAddr> {
         "Starting full deployment E2E test"
     );
 
-    let instance_ip = provision_infrastructure(env).await?;
+    let instance_ip = run_provision_command(env).await?;
 
-    configure_infrastructure(env)?;
+    run_configure_command(env)?;
 
     info!(status = "success", "Deployment completed successfully");
 

src/e2e/tasks/container/cleanup_infrastructure.rs

@@ -37,7 +37,7 @@ use crate::e2e::containers::RunningProvisionedContainer;
 /// # Example
 ///
 /// ```rust,no_run
-/// use torrust_tracker_deploy::e2e::tasks::container::cleanup_infrastructure::cleanup_docker_container;
+/// use torrust_tracker_deploy::e2e::tasks::container::cleanup_infrastructure::cleanup_infrastructure;
 /// use torrust_tracker_deploy::e2e::containers::StoppedProvisionedContainer;
 ///
 /// #[tokio::main]
@@ -47,12 +47,12 @@ use crate::e2e::containers::RunningProvisionedContainer;
 ///     
 ///     // ... perform tests ...
 ///     
-///     cleanup_docker_container(running_container);
+///     cleanup_infrastructure(running_container);
 ///     println!("Container cleanup completed");
 ///     Ok(())
 /// }
 /// ```
-pub fn cleanup_docker_container(running_container: RunningProvisionedContainer) {
+pub fn cleanup_infrastructure(running_container: RunningProvisionedContainer) {
     let container_id = running_container.container_id().to_string();
 
     info!(

src/e2e/tasks/container/configure_ssh_connectivity.rs

@@ -8,15 +8,9 @@
 //! ## Tasks Overview
 //!
 //! - `cleanup_infrastructure` - Stops and cleans up Docker containers after testing
-//! - `configure_ssh_connectivity` - Sets up SSH connectivity specifically for containers
 //! - `preflight_cleanup` - Container-specific preflight cleanup operations
-//! - `provision_docker_infrastructure` - Simulates infrastructure provisioning for containers
 //! - `run_provision_simulation` - Simulates provision phase for container-based testing
-//! - `setup_docker_container` - Creates and starts Docker containers for testing
 
 pub mod cleanup_infrastructure;
-pub mod configure_ssh_connectivity;
 pub mod preflight_cleanup;
-pub mod provision_docker_infrastructure;
 pub mod run_provision_simulation;
-pub mod setup_docker_container;

src/e2e/tasks/container/mod.rs

@@ -30,9 +30,7 @@ use tracing::info;
 /// # Errors
 ///
 /// Returns an error if directory cleanup fails and would prevent new test runs.
-pub fn cleanup_lingering_resources_docker(
-    env: &TestEnvironment,
-) -> Result<(), PreflightCleanupError> {
+pub fn cleanup_lingering_resources(env: &TestEnvironment) -> Result<(), PreflightCleanupError> {
     info!(
         operation = "preflight_cleanup_docker",
         "Starting pre-flight cleanup for Docker-based E2E tests"