From 4d3a6169cb0db5c1477991383860b30948d1b573 Mon Sep 17 00:00:00 2001 From: evanchia Date: Thu, 9 Dec 2021 09:42:33 -0800 Subject: [PATCH] removing the jobname from test artifact upload directory Signed-off-by: evanchia --- 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 8114d7e062..c66ce32094 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -457,11 +457,11 @@ def UploadAPLogs(String platformName, String jobName, String workspace, Map para } } -def UploadTestArtifacts(String jobName, String workspace, String outputDirectory) { +def UploadTestArtifacts(String workspace, String outputDirectory) { catchError(message: "Error archiving test artifacts (this won't fail the build)", buildResult: 'UNSTABLE', stageResult: 'FAILURE') { def cmakeBuildDir = [workspace, ENGINE_REPOSITORY_NAME, outputDirectory].join('/') echo "Uploading Test Artifacts: ${cmakeBuildDir}/Testing" - ArchiveArtifactsOnS3("${cmakeBuildDir}/Testing", "test_artifacts/${jobName}", true) + ArchiveArtifactsOnS3("${cmakeBuildDir}/Testing", "test_artifacts", true) } } @@ -548,7 +548,7 @@ def CreateUploadAPLogsStage(String platformName, String jobName, String workspac def CreateUploadTestArtifactStage(String jobName, String workspace, String outputDirectory) { return { stage("${jobName}_upload_test_artifacts") { - UploadTestArtifacts(jobName, workspace, outputDirectory) + UploadTestArtifacts(workspace, outputDirectory) } } }