removing the jobname from test artifact upload directory

Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-09 09:42:33 -08:00
parent 4992bce4c2
commit 4d3a6169cb
1 changed files with 3 additions and 3 deletions
@@ -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)
        }
    }
 }