Add HCS backend support (#258)

mtelvers · web-flow · commit dfe61a6be2b8 · 2026-04-09T16:43:38.000+01:00
* Add HCS backend support

* Update obuilder
diff --git a/bin/worker.ml b/bin/worker.ml
@@ -185,12 +185,13 @@ module Obuilder_config = struct
     Term.(const Obuilder.Store_spec.to_store $ v)
 
   let v =
-    let make native_conf docker_conf qemu_conf = function
+    let make native_conf docker_conf qemu_conf hcs_conf = function
       | `Native, store -> Some (Cluster_worker.Obuilder_config.v (`Native native_conf) store)
       | `Qemu, store -> Some (Cluster_worker.Obuilder_config.v (`Qemu qemu_conf) store)
       | `Docker, store -> Some (Cluster_worker.Obuilder_config.v (`Docker docker_conf) store)
+      | `Hcs, store -> Some (Cluster_worker.Obuilder_config.v (`Hcs hcs_conf) store)
     in
-    Term.(const make $ Obuilder.Native_sandbox.cmdliner $ Obuilder.Docker_sandbox.cmdliner $ Obuilder.Qemu_sandbox.cmdliner $ cmdliner)
+    Term.(const make $ Obuilder.Native_sandbox.cmdliner $ Obuilder.Docker_sandbox.cmdliner $ Obuilder.Qemu_sandbox.cmdliner $ Obuilder.Hcs_sandbox.cmdliner $ cmdliner)
 end
 
 let worker_opts_t =
diff --git a/obuilder b/obuilder
@@ -1 +1 @@
-Subproject commit c5f2c487976c3547c0e3abdc0d4a55f34f2af9c1
+Subproject commit a4329f09abdf762b019b83c9218c1d8dd1d6a093
diff --git a/worker/context.ml b/worker/context.ml
@@ -197,7 +197,7 @@ let build_context t ~log ~tmpdir descr =
         if include_git descr then (
           let cmd, is_success =
             if Sys.win32 then
-              ["robocopy"; clone / ".git"; tmpdir / ".git"; "/COPY:DATSO"; "/E"; "/R:0"; "/DCOPY:T"],
+              ["robocopy"; clone / ".git"; tmpdir / ".git"; "/COPY:DATSO"; "/E"; "/R:0"; "/DCOPY:T"; "/NFL"; "/NDL"; "/NJH"; "/NP"],
               fun s -> s = 1
             else
               ["cp"; "-a"; clone / ".git"; tmpdir / ".git"],
diff --git a/worker/obuilder_build.ml b/worker/obuilder_build.ml
@@ -7,7 +7,8 @@ module Config = struct
     store : Obuilder.Store_spec.store Lwt.t;
     sandbox_config : [ `Native of Obuilder.Native_sandbox.config
                      | `Qemu of Obuilder.Qemu_sandbox.config
-                     | `Docker of Obuilder.Docker_sandbox.config ]
+                     | `Docker of Obuilder.Docker_sandbox.config
+                     | `Hcs of Obuilder.Hcs_sandbox.config ]
   }
 
   let v sandbox_config store = { store; sandbox_config }
@@ -52,6 +53,11 @@ let create ?(prune_threshold = 30.0) ?(prune_limit = 100) config =
      Obuilder.Docker_sandbox.create conf >|= fun sandbox ->
      let builder = Builder.v ~store ~sandbox in
      Builder ((module Builder), builder)
+  | `Hcs conf ->
+     let module Builder = Obuilder.Builder (Store) (Obuilder.Hcs_sandbox) (Obuilder.Hcs_fetch) in
+     Obuilder.Hcs_sandbox.create ~state_dir:(Store.state_dir store / "sandbox") conf >|= fun sandbox ->
+     let builder = Builder.v ~store ~sandbox in
+     Builder ((module Builder), builder)
   end
   >>= fun (Builder ((module Builder), builder)) ->
   Log.info (fun f -> f "Performing OBuilder self-test…");
@@ -92,7 +98,7 @@ let build t ~switch ~log ~spec ~src_dir ~secrets =
   let log = log_to log in
   let Builder ((module Builder), builder) = t.builder in
   let shell = Builder.shell builder in
-  let context = Obuilder.Context.v ~switch ~log ~src_dir ?shell ~secrets () in
+  let context = Obuilder.Context.v ~switch ~log ~src_dir ~shell ~secrets () in
   Builder.build builder context spec
 
 let healthcheck t =
diff --git a/worker/obuilder_build.mli b/worker/obuilder_build.mli
@@ -5,7 +5,8 @@ module Config : sig
 
   val v : [ `Native of Obuilder.Native_sandbox.config
           | `Qemu of Obuilder.Qemu_sandbox.config
-          | `Docker of Obuilder.Docker_sandbox.config ]
+          | `Docker of Obuilder.Docker_sandbox.config
+          | `Hcs of Obuilder.Hcs_sandbox.config ]
           -> Obuilder.Store_spec.store Lwt.t -> t
 end
 
