Tweak how arm/armlb/arm64 smarty archive happens
authorBruce Forstall <brucefo@microsoft.com>
Wed, 22 Nov 2017 22:09:21 +0000 (14:09 -0800)
committerBruce Forstall <brucefo@microsoft.com>
Wed, 22 Nov 2017 22:15:02 +0000 (14:15 -0800)
Put the powershell command to create the archive in a separate
batch file step, so the smarty command error code will be recognized
separately.

netci.groovy

index 4f44dae..ce51786 100755 (executable)
@@ -2512,11 +2512,10 @@ Constants.allScenarios.each { scenario ->
                                 addCommand("pushd bin\\tests\\${osGroup}.${architecture}.${configuration}")
                                 addCommand("${smartyCommand}")
 
-                                // ZIP up the smarty output. Note that the current directory was changed above by "pushd", so we are
-                                // in the correct directory where the "Smarty.run.0" directory is.
-                                buildCommands += "powershell -Command \"Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::CreateFromDirectory('.\\Smarty.run.0', '.\\Smarty.run.0.zip')\"";
-
                                 batchFile(buildCommands)
+
+                                // ZIP up the smarty output.
+                                batchFile("powershell -NoProfile -Command \"Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::CreateFromDirectory('.\\bin\\tests\\${osGroup}.${architecture}.${configuration}\\Smarty.run.0', '.\\bin\\tests\\${osGroup}.${architecture}.${configuration}\\Smarty.run.0.zip')\"")
                             }
                         }
                     }