Bugfix when reporting that scheduler is in setup phase

v2/robotmk/src/bin/scheduler/main.rs

@@ -46,17 +46,19 @@ fn run() -> Result<()> {
         bail!("Terminated")
     }
 
-    write_state(&results::SchedulerState::Setup, &global_config)?;
-    let suites = setup::setup(&global_config, suites)?;
-    debug!("Setup completed");
+    setup::general::setup(&global_config, &suites).context("General setup failed")?;
+    debug!("General setup completed");
+    write_phase(&results::SchedulerPhase::RCCSetup, &global_config)?;
+    let suites = setup::rcc::setup(&global_config, suites).context("RCC-specific setup failed")?;
+    debug!("RCC-specific setup completed");
 
     if global_config.termination_flag.should_terminate() {
         bail!("Terminated")
     }
 
     info!("Starting environment building");
-    write_state(
-        &results::SchedulerState::EnvironmentBuilding,
+    write_phase(
+        &results::SchedulerPhase::EnvironmentBuilding,
         &global_config,
     )?;
     let suites = environment::build_environments(&global_config, suites)?;
@@ -67,16 +69,16 @@ fn run() -> Result<()> {
     }
 
     info!("Starting suite scheduling");
-    write_state(&results::SchedulerState::Scheduling, &global_config)?;
+    write_phase(&results::SchedulerPhase::Scheduling, &global_config)?;
     scheduling::scheduler::run_suites_and_cleanup(&global_config, &suites)
 }
 
-fn write_state(
-    state: &results::SchedulerState,
+fn write_phase(
+    phase: &results::SchedulerPhase,
     global_config: &internal_config::GlobalConfig,
 ) -> Result<()> {
-    state.write(
-        global_config.results_directory.join("scheduler_state.json"),
+    phase.write(
+        global_config.results_directory.join("scheduler_phase.json"),
         &global_config.results_directory_locker,
     )
 }

v2/robotmk/src/bin/scheduler/results.rs

@@ -13,15 +13,15 @@ pub fn suite_results_directory(results_directory: &Utf8Path) -> Utf8PathBuf {
 }
 
 #[derive(Serialize)]
-pub enum SchedulerState {
-    Setup,
+pub enum SchedulerPhase {
+    RCCSetup,
     EnvironmentBuilding,
     Scheduling,
 }
 
-impl WriteSection for SchedulerState {
+impl WriteSection for SchedulerPhase {
     fn name() -> &'static str {
-        "robotmk_scheduler_state"
+        "robotmk_scheduler_phase"
     }
 }
 

v2/robotmk/src/bin/scheduler/setup.rs

@@ -0,0 +1,3 @@
+pub mod general;
+mod icacls;
+pub mod rcc;