code review changes

Sanju Yadav · Sanju Yadav · commit 5fdbd8066de9 · 2025-11-06T17:57:10.000+05:30
diff --git a/src/Agent.Worker/ContainerOperationProvider.cs b/src/Agent.Worker/ContainerOperationProvider.cs
@@ -474,22 +474,22 @@ private string BuildContainerStartupCommand(
             Func<string, string> nodeSetInterval,
             Func<string, string> useDoubleQuotes)
         {
-            string sleepCommand;
+            string startupCommand;
 
             if (useNode24ToStartContainer)
             {
-                sleepCommand = $"'{node24ContainerPath}' --version && echo '{labelContainerStartupUsingNode24}' && {nodeSetInterval(node24ContainerPath)} || '{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} || '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} || echo '{labelContainerStartupFailed}'";
+                startupCommand = $"'{node24ContainerPath}' --version && echo '{labelContainerStartupUsingNode24}' && {nodeSetInterval(node24ContainerPath)} || '{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} || '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} || echo '{labelContainerStartupFailed}'";
             }
             else if (useNode20ToStartContainer)
             {
-                sleepCommand = $"'{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} || '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} || echo '{labelContainerStartupFailed}'";
+                startupCommand = $"'{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} || '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} || echo '{labelContainerStartupFailed}'";
             }
             else
             {
-                sleepCommand = nodeSetInterval(nodeContainerPath);
+                startupCommand = nodeSetInterval(nodeContainerPath);
             }
 
-            return PlatformUtil.RunningOnWindows ? $"cmd.exe /c call {useDoubleQuotes(sleepCommand)}" : $"bash -c \"{sleepCommand}\"";
+            return PlatformUtil.RunningOnWindows ? $"cmd.exe /c call {useDoubleQuotes(startupCommand)}" : $"bash -c \"{startupCommand}\"";
         }
 
         private async Task<bool> WaitForContainerStartupAsync(
@@ -679,7 +679,7 @@ string useDoubleQuotes(string value)
                 {
                     useAgentNode = true;
 
-                    string sleepCommand = BuildContainerStartupCommand(
+                    string startupCommand = BuildContainerStartupCommand(
                         useNode24ToStartContainer,
                         useNode20ToStartContainer,
                         node24ContainerPath,
@@ -693,7 +693,7 @@ string useDoubleQuotes(string value)
                         nodeSetInterval,
                         useDoubleQuotes);
 
-                    container.ContainerCommand = sleepCommand;
+                    container.ContainerCommand = startupCommand;
                     container.ResultNodePath = nodeContainerPath;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -474,22 +474,22 @@ private string BuildContainerStartupCommand(`
`474`	`474`	`Func<string, string> nodeSetInterval,`
`475`	`475`	`Func<string, string> useDoubleQuotes)`
`476`	`476`	`{`
`477`		`- string sleepCommand;`
	`477`	`+ string startupCommand;`
`478`	`478`
`479`	`479`	`if (useNode24ToStartContainer)`
`480`	`480`	`{`
`481`		`- sleepCommand = $"'{node24ContainerPath}' --version && echo '{labelContainerStartupUsingNode24}' && {nodeSetInterval(node24ContainerPath)} \|\| '{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} \|\| '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} \|\| echo '{labelContainerStartupFailed}'";`
	`481`	`+ startupCommand = $"'{node24ContainerPath}' --version && echo '{labelContainerStartupUsingNode24}' && {nodeSetInterval(node24ContainerPath)} \|\| '{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} \|\| '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} \|\| echo '{labelContainerStartupFailed}'";`
`482`	`482`	`}`
`483`	`483`	`else if (useNode20ToStartContainer)`
`484`	`484`	`{`
`485`		`- sleepCommand = $"'{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} \|\| '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} \|\| echo '{labelContainerStartupFailed}'";`
	`485`	`+ startupCommand = $"'{node20ContainerPath}' --version && echo '{labelContainerStartupUsingNode20}' && {nodeSetInterval(node20ContainerPath)} \|\| '{node16ContainerPath}' --version && echo '{labelContainerStartupUsingNode16}' && {nodeSetInterval(node16ContainerPath)} \|\| echo '{labelContainerStartupFailed}'";`
`486`	`486`	`}`
`487`	`487`	`else`
`488`	`488`	`{`
`489`		`- sleepCommand = nodeSetInterval(nodeContainerPath);`
	`489`	`+ startupCommand = nodeSetInterval(nodeContainerPath);`
`490`	`490`	`}`
`491`	`491`
`492`		`- return PlatformUtil.RunningOnWindows ? $"cmd.exe /c call {useDoubleQuotes(sleepCommand)}" : $"bash -c \"{sleepCommand}\"";`
	`492`	`+ return PlatformUtil.RunningOnWindows ? $"cmd.exe /c call {useDoubleQuotes(startupCommand)}" : $"bash -c \"{startupCommand}\"";`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`private async Task<bool> WaitForContainerStartupAsync(`
`@@ -679,7 +679,7 @@ string useDoubleQuotes(string value)`
`679`	`679`	`{`
`680`	`680`	`useAgentNode = true;`
`681`	`681`
`682`		`- string sleepCommand = BuildContainerStartupCommand(`
	`682`	`+ string startupCommand = BuildContainerStartupCommand(`
`683`	`683`	`useNode24ToStartContainer,`
`684`	`684`	`useNode20ToStartContainer,`
`685`	`685`	`node24ContainerPath,`
`@@ -693,7 +693,7 @@ string useDoubleQuotes(string value)`
`693`	`693`	`nodeSetInterval,`
`694`	`694`	`useDoubleQuotes);`
`695`	`695`
`696`		`- container.ContainerCommand = sleepCommand;`
	`696`	`+ container.ContainerCommand = startupCommand;`
`697`	`697`	`container.ResultNodePath = nodeContainerPath;`
`698`	`698`	`}`
`699`	`699`	`}`