working version

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/commands/node.mjs

@@ -907,6 +907,7 @@ export class NodeCommand extends BaseCommand {
 
           // compute other config parameters
           // TODO DRY
+          self.logger.debug(`[cacheDir=${config.cacheDir}]`)
           config.releasePrefix = Templates.prepareReleasePrefix(config.releaseTag)
           config.buildZipFile = `${config.cacheDir}/${config.releasePrefix}/build-${config.releaseTag}.zip`
           config.keysDir = path.join(config.cacheDir, 'keys')
@@ -973,7 +974,9 @@ export class NodeCommand extends BaseCommand {
             subTasks.push({
               title: `Node: ${chalk.yellow(nodeId)}`,
               task: () =>
-                self.plaformInstaller.taskInstall(podName, config.buildZipFile, config.stagingDir, config.nodeIds, config.keyFormat, config.force)
+                self.plaformInstaller.taskInstall(podName, config.buildZipFile, config.stagingDir,
+                  ['node0', 'node1', 'node2', 'node3'], // TODO get nodeIds to copy keys from // config.nodeIds,
+                  config.keyFormat, config.force)
             })
           }
 
@@ -1027,29 +1030,11 @@ export class NodeCommand extends BaseCommand {
           })
         }
       },
-      {
-        title: 'Check nodes are ACTIVE',
-        task: (ctx, task) => {
-          const subTasks = []
-          for (const nodeId of ctx.config.nodeIds) {
-            subTasks.push({
-              title: `Check node: ${chalk.yellow(nodeId)}`,
-              task: () => self.checkNetworkNodeStarted(nodeId)
-            })
-          }
-
-          // set up the sub-tasks
-          return task.newListr(subTasks, {
-            concurrent: false,
-            rendererOptions: {
-              collapseSubtasks: false
-            }
-          })
-        }
-      },
       {
         title: 'Check node proxies are ACTIVE',
-        task: async (ctx, parentTask) => {
+        // this is more reliable than checking the nodes logs for ACTIVE, as the
+        // logs will have a lot of white noise from being behind
+        task: async (ctx, task) => {
           const subTasks = []
           let localPort = constants.LOCAL_NODE_PROXY_START_PORT
           for (const nodeId of ctx.config.nodeIds) {
@@ -1060,7 +1045,7 @@ export class NodeCommand extends BaseCommand {
           }
 
           // set up the sub-tasks
-          return parentTask.newListr(subTasks, {
+          return task.newListr(subTasks, {
             concurrent: false,
             rendererOptions: {
               collapseSubtasks: false