@@ -3171,13 +3171,17 @@
 ;; arm cubie01 cubie02
 ;; x86_64 zeus xena myth01
 ;; allhosts #{g hosts arm} #{g hosts x86_64}
 ;; 
 ;; [host-types]
+;; C/M/A      lets megatest know this launcher provides C cores, M bytes memory for architecture A 
+;; 2/2G/arm   smart -cores 2 -memory 2G -arch arm
 ;; general #MTLOWESTLOAD #{g hosts allhosts}
 ;; arm     #MTLOWESTLOAD #{g hosts arm}
 ;; nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo
+;;
+;; NOTE: host-rules is ONLY used for MTLOWESTLOAD
 ;;
 ;; [host-rules]
 ;; # maxnload   => max normalized load
 ;; # maxnjobs   => max jobs per cpu
 ;; # maxjobrate => max jobs per second
@@ -3190,12 +3194,15 @@
 ;; 
 ;; [jobtools]
 ;; # if defined and not "no" flexi-launcher will bypass "launcher" unless no match.
 ;; flexi-launcher yes  
 ;; launcher nbfake
+;; mode adjutant|normal (default is normal)
+;;
+;; mode is 'normal (i.e. directly use launcher) or 'adjutant (i.e. use adjutant)
 ;;
-(define (common:get-launcher configdat testname itempath)
+(define (common:get-launcher configdat testname itempath mode)
   (let ((fallback-launcher (configf:lookup configdat "jobtools" "launcher")))
     (if (and (configf:lookup configdat "jobtools" "flexi-launcher") ;; overrides launcher
 	     (not (equal? (configf:lookup configdat "jobtools" "flexi-launcher") "no")))
 	(let* ((launchers         (hash-table-ref/default configdat "launchers" '())))
 	  (if (null? launchers)
@@ -3202,32 +3209,36 @@
 	      fallback-launcher
 	      (let loop ((hed (car launchers))
 			 (tal (cdr launchers)))
 		(let ((patt      (car hed))
 		      (host-type (cadr hed)))
-		  (if (tests:match patt testname itempath)
+		  (if (tests:match patt testname itempath) ;; have a launcher match for this test
 		      (begin
 			(debug:print-info 2 *default-log-port* "Have flexi-launcher match for " testname "/" itempath " = " host-type)
-			(let ((launcher (configf:lookup configdat "host-types" host-type)))
+			(let ((launcher (configf:lookup configdat "host-types" host-type))) ;; find the actual launcher from the host-types table
+			  ;; if we are in adjutant mode then we want to return both host-type and launcher
 			  (if launcher
 			      (let* ((launcher-parts (string-split launcher))
 				     (launcher-exe   (car launcher-parts)))
 				(if (equal? launcher-exe "#MTLOWESTLOAD") ;; this is our special case, we will find the lowest load and craft a nbfake commandline
 				    (let host-loop ((targ-host (common:get-least-loaded-host (cdr launcher-parts) host-type configdat))
 						    (count     100))
 				      (if targ-host
 					  (conc "remrun " targ-host)
 					  (if (> count 0)
+					      
 					      (begin
 						(debug:print 0 *default-log-port* "INFO: Waiting for a host for host-type " host-type)
 						(thread-sleep! (- 101 count))
 						(host-loop (common:get-least-loaded-host (cdr launcher-parts) host-type configdat)
 							   (- count 1)))
 					      (begin
 						(debug:print 0 *default-log-port* "FATAL: Failed to find a host from #MTLOWESTLOAD for host-type " host-type)
 						(exit)))))
-				    launcher))
+				    (case mode
+				      ((adjutant) (list host-type launcher))
+				      (else       launcher))))
 			      (begin
 				(debug:print-info 0 *default-log-port* "WARNING: no launcher found for host-type " host-type)
 				(if (null? tal)
 				    fallback-launcher
 				    (loop (car tal)(cdr tal)))))))