From 9373c5fd0d45ed20170f9f8f580fc80c031b6cbe Mon Sep 17 00:00:00 2001 From: evanchia Date: Mon, 7 Jun 2021 18:31:57 -0700 Subject: [PATCH 1/3] Fixing xml directory race condition on incremental runs --- scripts/build/Jenkins/Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile index 1bce2988bf..4d350da55a 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -365,8 +365,11 @@ def ExportTestResults(Map options, String platform, String type, String workspac def o3deroot = "${workspace}/${ENGINE_REPOSITORY_NAME}" dir("${o3deroot}/${params.OUTPUT_DIRECTORY}") { junit testResults: "Testing/**/*.xml" - palRmDir("Testing") + palRmDir("Testing/*") } + // Recreate test runner xml directories that need to be pre generated + palMkdir("Testing/Pytest") + palMkdir("Testing/Gtest") } } From 9afe5225e6424756281127e8175c218cba1770ae Mon Sep 17 00:00:00 2001 From: evanchia Date: Mon, 7 Jun 2021 18:39:03 -0700 Subject: [PATCH 2/3] removing wildcard from rmdir, not windows compatible --- scripts/build/Jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile index 4d350da55a..e1384fcbe5 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -365,7 +365,7 @@ def ExportTestResults(Map options, String platform, String type, String workspac def o3deroot = "${workspace}/${ENGINE_REPOSITORY_NAME}" dir("${o3deroot}/${params.OUTPUT_DIRECTORY}") { junit testResults: "Testing/**/*.xml" - palRmDir("Testing/*") + palRmDir("Testing") } // Recreate test runner xml directories that need to be pre generated palMkdir("Testing/Pytest") From b2a6616a3174be80524fe03108754e7ec01bffee Mon Sep 17 00:00:00 2001 From: evanchia Date: Mon, 7 Jun 2021 18:50:21 -0700 Subject: [PATCH 3/3] fixed cwd error --- scripts/build/Jenkins/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile index e1384fcbe5..693cf31727 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -366,10 +366,10 @@ def ExportTestResults(Map options, String platform, String type, String workspac dir("${o3deroot}/${params.OUTPUT_DIRECTORY}") { junit testResults: "Testing/**/*.xml" palRmDir("Testing") + // Recreate test runner xml directories that need to be pre generated + palMkdir("Testing/Pytest") + palMkdir("Testing/Gtest") } - // Recreate test runner xml directories that need to be pre generated - palMkdir("Testing/Pytest") - palMkdir("Testing/Gtest") } }