jolt 0.9.371__tar.gz → 0.9.381__tar.gz

{jolt-0.9.371 → jolt-0.9.381}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jolt
-Version: 0.9.371
+Version: 0.9.381
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

{jolt-0.9.371 → jolt-0.9.381}/jolt/cli.py

@@ -18,7 +18,7 @@ from jolt import log
 from jolt import __version__
 from jolt.log import logfile
 from jolt import config
-from jolt.loader import JoltLoader
+from jolt.loader import JoltLoader, import_workspace
 from jolt import tools
 from jolt import utils
 from jolt.influence import HashInfluenceRegistry
@@ -216,12 +216,13 @@ def _autocomplete_tasks(ctx, args, incomplete):
               help="Don't prune cached artifacts from the build graph. This option can be used to populate the local cache with remotely cached dependency artifacts.")
 @click.option("--worker", is_flag=True, default=False,
               help="Run with the worker build strategy", hidden=True)
+@click.option("--environ", type=click.Path(), help="Import build environment from protobuf", hidden=True)
 @click.pass_context
 @hooks.cli_build
 def build(ctx, task, network, keep_going, default, local,
           no_download, no_download_persistent, no_upload, download, upload, worker, force,
           salt, copy, debug, result, jobs, no_prune, verbose,
-          mute):
+          mute, environ):
     """
     Build task artifact.
 
@@ -253,6 +254,7 @@ def build(ctx, task, network, keep_going, default, local,
     are removed before execution starts.
 
     """
+
     raise_error_if(network and local,
                    "The -n and -l flags are mutually exclusive")
 
@@ -304,6 +306,33 @@ def build(ctx, task, network, keep_going, default, local,
     if keep_going:
         config.set_keep_going(True)
 
+    # Import build environment from protobuf if provided
+    buildenv = None
+    if environ:
+        with open(environ, "rb") as f:
+            from jolt import common_pb2 as common_pb
+            buildenv = common_pb.BuildEnvironment()
+            try:
+                buildenv.ParseFromString(f.read())
+            except Exception as e:
+                raise_error("Failed to parse build environment protobuf: {}", e)
+
+        # Import log level
+        log.set_level_pb(buildenv.loglevel)
+
+        # Import workspace
+        import_workspace(buildenv)
+
+        # Import configuration snippet
+        config.import_config(buildenv.config)
+
+        # Import configuration parameters (-c params.key)
+        config.import_params({param.key: param.value for param in buildenv.parameters})
+
+        # Import default parameters (-d taskname:param=value)
+        default = utils.as_list(default)
+        default += buildenv.task_default_parameters
+
     options = JoltOptions(
         network=network,
         local=local,
@@ -340,7 +369,7 @@ def build(ctx, task, network, keep_going, default, local,
 
     log.info("Started: {}", datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
 
-    gb = graph.GraphBuilder(registry, acache, options, progress=True)
+    gb = graph.GraphBuilder(registry, acache, options, progress=True, buildenv=buildenv)
     dag = gb.build(task)
 
     # If asked to force rebuild, taint all goal tasks
@@ -374,9 +403,11 @@ def build(ctx, task, network, keep_going, default, local,
             debug=debug)
 
         with progress:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
                 # Find all tasks ready to be executed
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 # Order the tasks by their weights to improve build times
                 leafs.sort(key=lambda x: x.weight)
@@ -385,6 +416,7 @@ def build(ctx, task, network, keep_going, default, local,
                     task = leafs.pop()
                     executor = strategy.create_executor(session, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, error = queue.wait()
 
@@ -745,13 +777,16 @@ def download(ctx, task, deps, copy, copy_all):
 
     try:
         with log.progress("Progress", dag.number_of_tasks(), " tasks", estimates=False, debug=False) as p:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 while leafs:
                     task = leafs.pop()
                     executor = strategy.create_executor({}, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, error = queue.wait()
                 p.update(1)

{jolt-0.9.371 → jolt-0.9.381}/jolt/loader.py

@@ -252,6 +252,7 @@ class JoltLoader(object):
             for factory in _loaders:
                 loader = factory().create(searchpath)
                 for recipe in loader.recipes:
+                    recipe.workspace_path = os.path.relpath(recipe.path, self.workspace_path)
                     recipe.load()
                     self._recipes.append(recipe)
                     self._tasks += recipe.tasks
@@ -450,6 +451,7 @@ def export_workspace(tasks=None) -> common_pb.Workspace:
     cache_grpc_uri = config.geturi("cache", "grpc_uri")
     if fstree_enabled:
         if not cache_grpc_uri:
+            fstree_enabled = False
             log.warning("No cache gRPC URI configured, will not push workspace to remote cache")
         else:
             raise_error_if(cache_grpc_uri.scheme not in ["tcp"], "Invalid scheme in cache gRPC URI config: {}", cache_grpc_uri.scheme)
@@ -542,12 +544,13 @@ def export_workspace(tasks=None) -> common_pb.Workspace:
         tree=tree,
     )
 
-    for recipe in loader.recipes:
-        workspace.files.append(
-            common_pb.File(
-                path=recipe.basepath,
-                content=recipe.source,
+    if not fstree_enabled:
+        for recipe in loader.recipes:
+            workspace.files.append(
+                common_pb.File(
+                    path=recipe.workspace_path,
+                    content=recipe.source,
+                )
             )
-        )
 
     return workspace

{jolt-0.9.371 → jolt-0.9.381}/jolt/plugins/docker.py

@@ -103,8 +103,8 @@ class DockerClient(Download):
     url = "https://download.docker.com/{host}/static/stable/{arch}/docker-{version}.tgz"
     """ URL of binaries """
 
-    version = Parameter("27.3.1", help="Docker version")
-    """ Docker version [27.3.1] """
+    version = Parameter("27.4.1", help="Docker version")
+    """ Docker version [27.4.1] """
 
     def publish(self, artifact, tools):
         super().publish(artifact, tools)

{jolt-0.9.371 → jolt-0.9.381}/jolt/plugins/gdb.py

@@ -86,13 +86,16 @@ def gdb(ctx, task, default, machine_interface, no_binary, gdb_args):
 
     try:
         with log.progress("Progress", dag.number_of_tasks(), " tasks", estimates=False, debug=False) as p:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 while leafs:
                     task = leafs.pop()
                     executor = strategy.create_executor({}, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, _ = queue.wait()
 

{jolt-0.9.371 → jolt-0.9.381}/jolt/plugins/ninja-compdb.py

@@ -242,8 +242,10 @@ def compdb(ctx, task, default):
 
     try:
         with log.progress("Progress", dag.number_of_tasks(), " tasks", estimates=False, debug=False) as progress:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 # Order the tasks by their weights to improve build times
                 leafs.sort(key=lambda x: x.weight)
@@ -252,6 +254,7 @@ def compdb(ctx, task, default):
                     task = leafs.pop()
                     executor = strategy.create_executor({}, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, _ = queue.wait()
 

{jolt-0.9.371 → jolt-0.9.381}/jolt/plugins/podman.py

@@ -1,4 +1,4 @@
-from jolt import Download, Parameter, Resource, Task
+from jolt import Parameter, Resource, Task
 from jolt.error import raise_task_error_if
 from jolt.tasks import TaskRegistry
 from jolt import attributes
@@ -15,7 +15,6 @@ from jolt.cache import ArtifactAttributeSetProvider
 import contextlib
 import json
 from os import path
-from platform import system
 import tarfile
 
 
@@ -100,35 +99,6 @@ class PodmanAttributeProvider(ArtifactAttributeSetProvider):
         artifact.podman.unapply(task, artifact)
 
 
-class PodmanClient(Download):
-    """ Task: Downloads and publishes the Podman command line client.
-
-    The task will be automatically made available after importing
-    ``jolt.plugins.podman``.
-    """
-
-    name = "podman/cli"
-    """ Name of the task """
-
-    arch = Parameter("x86_64", help="Host architecture")
-    """ Host architecture [x86_64] """
-
-    collect = ["podman/podman"]
-
-    host = Parameter(system().lower(), help="Host operating system")
-    """ Host operating system [autodetected] """
-
-    url = "https://download.podman.com/{host}/static/stable/{arch}/podman-{version}.tgz"
-    """ URL of binaries """
-
-    version = Parameter("20.10.13", help="Podman version")
-    """ Podman version [20.10.13] """
-
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.environ.PATH.append("podman")
-
-
 @attributes.requires("_image")
 class Container(Resource):
     """
@@ -344,8 +314,6 @@ class PodmanLogin(Resource):
     name = "podman/login"
     """ Name of the resource """
 
-    requires = ["podman/cli"]
-
     user = Parameter("", help="Podman Registry username")
     """
     Podman Registry username.
@@ -385,7 +353,6 @@ class PodmanLogin(Resource):
         tools.run("podman logout {server}")
 
 
-TaskRegistry.get().add_task_class(PodmanClient)
 TaskRegistry.get().add_task_class(PodmanLogin)
 
 
@@ -445,7 +412,6 @@ class ContainerImage(Task):
 
     Optionally add requirements to:
 
-      - ``podman/cli`` to provision the Podman client, if none is available on the host.
       - ``podman/login`` to automatically login to the Podman registry.
 
     This class must be subclassed.
@@ -468,7 +434,6 @@ class ContainerImage(Task):
         class Busybox(ContainerImage):
             \"\"\" Publishes Busybox image as gzip-compressed tarball \"\"\"
             compression = "gz"
-            requires = ["podman/cli"]
             tags = ["busybox:{identity}"]
 
     """

jolt-0.9.381/jolt/version.py

@@ -0,0 +1 @@
+__version__ = "0.9.381"

{jolt-0.9.371 → jolt-0.9.381}/jolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jolt
-Version: 0.9.371
+Version: 0.9.381
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

jolt-0.9.371/jolt/version.py

@@ -1 +0,0 @@
-__version__ = "0.9.371"