reordered so that the full reboot works (need mirror to be up to rm trackers)

diff --git a/scripts/manage-infrastructure.py b/scripts/manage-infrastructure.py
index 7bb4c58..bf11a8e 100755 (executable)
--- a/scripts/manage-infrastructure.py
+++ b/scripts/manage-infrastructure.py
@@ -244,6 +244,9 @@ class BuildBoxes:
         return buildname
 
     def handle_testmaster_box (self, box):
+        if not self.options.probe: 
+            pass
+        else:
             command=['pgrep','run_log']
             if self.options.dry_run:
                 self.run_ssh(box,command,None)
@@ -313,7 +316,7 @@ Default is to act on test boxes only"""
             self.do_tracker_plcs = False
             self.do_tracker_qemus = False
         elif self.options.all_boxes:
-            self.boxes=self.test_boxes + self.build_boxes
+            self.boxes=self.test_boxes + self.build_boxes + self.testmaster_boxes
             self.do_tracker_plcs = True
             self.do_tracker_qemus = True
         elif self.options.build_only:
@@ -346,16 +349,16 @@ Default is to act on test boxes only"""
             for box in self.boxes: self.handle_disk(box)
             return
 
-        # ALL OTHERS
-        for box in self.boxes:  self.handle_box (box,"build")
-        # TESTMASTER
-        for box in self.boxes:  self.handle_box (box,"testmaster")
         # PLCS
         if self.do_tracker_plcs:self.handle_tracker_plcs ()
         for box in self.boxes:  self.handle_box (box,"plc")
         # QEMU
         if self.do_tracker_qemus:self.handle_tracker_qemus ()
         for box in self.boxes:  self.handle_box (box,"qemu")
+        # ALL OTHERS
+        for box in self.boxes:  self.handle_box (box,"build")
+        # TESTMASTER
+        for box in self.boxes:  self.handle_box (box,"testmaster")
 
 if __name__ == "__main__":
     BuildBoxes().main()