WIP

IntersectMBO · Aug 21, 2024 · 1ebb7e6 · 1ebb7e6
1 parent e9ab511
commit 1ebb7e6
Show file tree

Hide file tree

Showing 14 changed files with 146 additions and 735 deletions.
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ trace-documentation:
 ###
 ### Workbench
 ###
-workbench-ci: workbench-ci-test ci-test-auto ci-test-autonix ci-test-autonomadpodman
+workbench-ci: workbench-ci-test ci-test-auto ci-test-autonix
 CI_TARGETS := hlint workbench-ci haddock-hoogle
 ci:  ci-report ci-targets
 ci-report:

diff --git a/lib.mk b/lib.mk
@@ -42,8 +42,6 @@ $$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nix,              $$(prof)
 $$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-autonix,          $$(prof), true,false, true,false, false, supervisor)))
 $$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadexec,        $$(prof), true,false,false,false, false, nomadexec)))
 $$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadexec-auto,   $$(prof), true,false, true,false, false, nomadexec)))
-$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadpodman,      $$(prof), true,false,false,false, false, nomadpodman)))
-$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadpodman-auto, $$(prof), true,false, true,false, false, nomadpodman)))
 endef
 
 define define_profile_targets_nomadcloud

diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -23,8 +23,6 @@ let
           import ./workbench/backend/nomad/cloud.nix  params;
         nomadexec       = params:
           import ./workbench/backend/nomad/exec.nix   params;
-        nomadpodman     = params:
-          import ./workbench/backend/nomad/podman.nix params;
         supervisor      = params:
           import ./workbench/backend/supervisor.nix   params;
       }

diff --git a/nix/workbench/backend/nomad-job.nix b/nix/workbench/backend/nomad-job.nix
diff --git a/nix/workbench/backend/nomad.nix b/nix/workbench/backend/nomad.nix
@@ -160,49 +160,16 @@ let
               [ diretories.run "supervisor" "supervisord.conf"]
             ;
           };
-          ociImage = import ./oci-images.nix
-            { inherit pkgs lib;
-              inherit containerPkgs;
-            }
-          ;
           nomadJob =
             { inherit generatorTaskName; }
             //
-            lib.attrsets.optionalAttrs (subBackendName == "podman") {
-              podman = {
-                # TODO: oneTracerPerGroup
-                oneTracerPerCluster = import ./nomad-job.nix
-                  { inherit pkgs lib stateDir;
-                    inherit profileData;
-                    inherit containerSpecs;
-                    # May evolve to a "cloud" flag!
-                    execTaskDriver = false;
-                    inherit generatorTaskName;
-                    oneTracerPerNode = false;
-                    withSsh = false;
-                  };
-                oneTracerPerNode = import ./nomad-job.nix
-                  { inherit pkgs lib stateDir;
-                    inherit profileData;
-                    inherit containerSpecs;
-                    # May evolve to a "cloud" flag!
-                    execTaskDriver = false;
-                    inherit generatorTaskName;
-                    oneTracerPerNode = true;
-                    withSsh = false;
-                  };
-              };
-            }
-            //
             lib.attrsets.optionalAttrs (subBackendName == "exec") {
               exec = {
                 # TODO: oneTracerPerGroup
                 oneTracerPerCluster = import ./nomad-job.nix
                   { inherit pkgs lib stateDir;
                     inherit profileData;
                     inherit containerSpecs;
-                    # May evolve to a "cloud" flag!
-                    execTaskDriver = true;
                     inherit generatorTaskName;
                     oneTracerPerNode = false;
                     withSsh = false;
@@ -211,8 +178,6 @@ let
                   { inherit pkgs lib stateDir;
                     inherit profileData;
                     inherit containerSpecs;
-                    # May evolve to a "cloud" flag!
-                    execTaskDriver = true;
                     inherit generatorTaskName;
                     oneTracerPerNode = true;
                     withSsh = false;
@@ -228,8 +193,6 @@ let
                   { inherit pkgs lib stateDir;
                     inherit profileData;
                     inherit containerSpecs;
-                    # May evolve to a "cloud" flag!
-                    execTaskDriver = true;
                     inherit generatorTaskName;
                     oneTracerPerNode = true;
                     withSsh = false;
@@ -238,8 +201,6 @@ let
                   { inherit pkgs lib stateDir;
                     inherit profileData;
                     inherit containerSpecs;
-                    # May evolve to a "cloud" flag!
-                    execTaskDriver = true;
                     inherit generatorTaskName;
                     oneTracerPerNode = true;
                     withSsh = true;