From 3f92019489f13fd55cfec4e71df5b9aeeb2978a4 Mon Sep 17 00:00:00 2001
From: Joerg Herbel <joerg.herbel@checkmk.com>
Date: Tue, 14 Nov 2023 12:31:31 +0100
Subject: [PATCH] Do general setup before reporting any results

We cannot report results before the general setup is completed because
the necessary folders might be missing.
---
 v2/robotmk/src/bin/scheduler/main.rs    | 2 +-
 v2/robotmk/src/bin/scheduler/results.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2/robotmk/src/bin/scheduler/main.rs b/v2/robotmk/src/bin/scheduler/main.rs
index fc86b061..cadf23a8 100644
--- a/v2/robotmk/src/bin/scheduler/main.rs
+++ b/v2/robotmk/src/bin/scheduler/main.rs
@@ -46,9 +46,9 @@ fn run() -> Result<()> {
         bail!("Terminated")
     }
 
-    write_state(&results::SchedulerState::Setup, &global_config)?;
     setup::general::setup(&global_config, &suites).context("General setup failed")?;
     debug!("General setup completed");
+    write_state(&results::SchedulerState::RCCSetup, &global_config)?;
     let suites = setup::rcc::setup(&global_config, suites).context("RCC-specific setup failed")?;
     debug!("RCC-specific setup completed");
 
diff --git a/v2/robotmk/src/bin/scheduler/results.rs b/v2/robotmk/src/bin/scheduler/results.rs
index 16c5ec92..60ffd2a9 100644
--- a/v2/robotmk/src/bin/scheduler/results.rs
+++ b/v2/robotmk/src/bin/scheduler/results.rs
@@ -14,7 +14,7 @@ pub fn suite_results_directory(results_directory: &Utf8Path) -> Utf8PathBuf {
 
 #[derive(Serialize)]
 pub enum SchedulerState {
-    Setup,
+    RCCSetup,
     EnvironmentBuilding,
     Scheduling,
 }