@andrian.yablonskyy/thub-coordinator 1.0.24 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "TestHub Coordinator — job queue, resource registry, scheduler, heartbeat monitor, log/artifact store and web dashboard",
   "main": "src/server.js",
   "engines": {

package/src/services/jobs.js

@@ -145,15 +145,22 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
       spec.target.client = resource.id;
     }
 
-    // A job-supplied Docker image needs an SW Client that opted in — say so
-    // specifically rather than the generic "no resource can satisfy".
-    const needs = { jobImage: Boolean(spec.firmware.image) },
+    // A job-supplied Docker image or command needs a Client that opted in —
+    // say which, rather than the generic "no resource can satisfy".
+    const needs = { jobImage: Boolean(spec.firmware.image), jobCommand: Boolean(spec.tests.command) },
       { type, labels, group, client } = spec.target;
-    if (needs.jobImage && registry.everSatisfiable(type, labels, group, client) && !registry.everSatisfiable(type, labels, group, client, needs)){
+    if ((needs.jobImage || needs.jobCommand) && registry.everSatisfiable(type, labels, group, client) &&
+      !registry.everSatisfiable(type, labels, group, client, needs)){
+      const missing = [
+        needs.jobImage && !registry.everSatisfiable(type, labels, group, client, { jobImage: true }) &&
+          `job-supplied Docker images (${spec.firmware.image}) — "sw": { "allowJobImages": true }`,
+        needs.jobCommand && !registry.everSatisfiable(type, labels, group, client, { jobCommand: true }) &&
+          'job-supplied commands (--run) — "allowJobCommands": true'
+      ].filter(Boolean);
       throw Object.assign(
         new Error(
-          `No matching SW Client runs job-supplied Docker images (${spec.firmware.image}) — enable it on a Client ` +
-            'with "sw": { "allowJobImages": true } in its config, or pass a firmware URL instead'
+          `No matching Client runs ${missing.length ? missing.join(', nor ') : 'both a job-supplied Docker image and command together'}` +
+            ' — enable it in a Client\'s config'
         ),
         { status: 422 }
       );

package/src/services/registry.js

@@ -67,10 +67,16 @@ const MAX_DEVICES = 8,
     present: typeof d?.present === 'boolean' ? d.present : null
   });
 
+// Plus `allowJobCommands` (either type): runs a job's own `tests.command`.
 function sanitizeCapabilities(caps){
   if (!caps || typeof caps !== 'object'){
     return null;
   }
+  const typed = sanitizeTypedCapabilities(caps);
+  return typed ? { ...typed, allowJobCommands: caps.allowJobCommands === true } : null;
+}
+
+function sanitizeTypedCapabilities(caps){
   if (caps.sw && typeof caps.sw === 'object'){
     const sw = caps.sw;
     return {
@@ -469,13 +475,15 @@ function createRegistryService(db, { bus, events }){
     );
   }
 
-  // `needs.jobImage`: the job brings its own Docker image (firmware.image),
-  // which only SW Clients that opted in (sw.allowJobImages) will run.
+  // `needs`: what a job brings that a Client must have opted in to run —
+  // jobImage (firmware.image; sw.allowJobImages) and jobCommand
+  // (tests.command; allowJobCommands).
   function matchesTarget(r, labels, groupId, resourceId, needs = {}){
     return labels.every((l) => r.labels.includes(l)) &&
       (!groupId || r.group_ids.includes(groupId)) &&
       (!resourceId || r.id === resourceId) &&
-      (!needs.jobImage || r.capabilities?.sw?.allowJobImages === true);
+      (!needs.jobImage || r.capabilities?.sw?.allowJobImages === true) &&
+      (!needs.jobCommand || r.capabilities?.allowJobCommands === true);
   }
 
   // Admin: remove a resource from the registry (dashboard "Remove"). Refused

package/src/services/scheduler.js

@@ -15,6 +15,11 @@
 
 const { JOB_STATES, BUSY_SOURCES } = require('@andrian.yablonskyy/thub-common');
 
+// What a job needs a Client to have opted in to (registry matchesTarget).
+function jobNeeds(spec){
+  return { jobImage: Boolean(spec.firmware?.image), jobCommand: Boolean(spec.tests?.command) };
+}
+
 function rowToJob(row){
   return { ...row, spec: JSON.parse(row.spec) };
 }
@@ -43,7 +48,7 @@ function createScheduler(db, { bus, events, registry, config }){
         for (const job of queued){
           const { type, labels = [], group, client } = job.spec.target,
             candidates = registry
-              .findIdleCandidates(type, labels, group, client, { jobImage: Boolean(job.spec.firmware?.image) })
+              .findIdleCandidates(type, labels, group, client, jobNeeds(job.spec))
               .filter((r) => !claimedResourceIds.has(r.id));
           if (candidates.length === 0){
             continue;

package/test/scheduler.test.js

@@ -547,6 +547,24 @@ test('a job-supplied Docker image only goes to SW Clients that allow it; otherwi
   assert.equal(jobs.get(fileJob.id).resource_id, strict.id); // firmware URLs still go anywhere
 });
 
+test('a job-supplied command only goes to Clients with allowJobCommands; otherwise 422 naming it', () => {
+  const { registry, agents, jobs, scheduler } = buildTestServices(),
+    { agent } = agents.create({ name: 'dev', kind: 'cli' }),
+    commandJob = makeSpec({ tests: { url: 'https://x/t.tar.gz', command: 'make test' } }),
+    plain = registerResource(registry, { name: 'sw-plain', type: 'sw' });
+  registry.heartbeat(plain.id, { state: 'idle' });
+
+  assert.throws(() => jobs.create({ agentId: agent.id, source: 'cli', spec: commandJob }), /allowJobCommands/);
+
+  const { resourceId } = registry.registerAuto({
+    clientId: 'c-cmd', name: 'sw-cmd', type: 'sw', labels: [], capabilities: { sw: { image: 'emu' }, allowJobCommands: true }
+  });
+  registry.heartbeat(resourceId, { state: 'idle' });
+  const job = jobs.create({ agentId: agent.id, source: 'cli', spec: commandJob });
+  scheduler.runPass();
+  assert.equal(jobs.get(job.id).resource_id, resourceId);
+});
+
 test('a resource can belong to several groups at once', () => {
   const { registry, groups } = buildTestServices(),
     g1 = groups.create({ name: 'g1' }),