Преглед изворни кода

Fix NetSoakTest launcher path

- Move command into dir block to run in the correct workspace path
- Avoid running NetSoakTest on validation job
- Update path based on pipeline type

Signed-off-by: brianherrera <[email protected]>
brianherrera пре 3 година
родитељ
комит
f43063881a
1 измењених фајлова са 7 додато и 8 уклоњено
  1. 7 8
      Scripts/build/Jenkins/Jenkinsfile

+ 7 - 8
Scripts/build/Jenkins/Jenkinsfile

@@ -377,17 +377,16 @@ def Build(Map pipelineConfig, String platform, String type, String workspace) {
         command += " -u ${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}"
         dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
             PlatformSh(command, "Running ${platform} ${type}")
-        }
 
-        // Only launch NetSoakTest on the appropriate platforms
-        if (platform == 'Windows') {
-            // Launch the project, which automatically starts the tests
-            launch_command = "NetSoakTest.ServerLauncher.exe --soak_runtime=1800000 --soak_mode=loopback --rhi=null"
-            dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
-                PlatformSh("build/bin/profile/${launch_command}", "Running NetSoakTest project")
+            // Only launch NetSoakTest on the appropriate platforms
+            if (platform == 'Windows' && type != 'validation') {
+                // Launch the project, which automatically starts the tests
+                launch_command = "NetSoakTest.ServerLauncher.exe --soak_runtime=1800000 --soak_mode=loopback --rhi=null"
+                dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
+                    PlatformSh("build/windows/bin/${type}/${launch_command}", "Running NetSoakTest project")
+                }
             }
         }
-
     }
 }