birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add platform name to AP log path on S3 (#5316)

Browse Source 
* Add platform name to AP log path on S3

Signed-off-by: shiranj <shiranj@amazon.com>

* Add platform name to AP log path on S3

Signed-off-by: shiranj <shiranj@amazon.com>
This commit is contained in:
Shirang Jia
2021-11-05 10:36:14 -07:00
committed by GitHub
parent b5d5ffb74c
commit 08115fc41f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/Jenkins/Jenkinsfile
Vendored
+6 -6
View File
@@ -271,7 +271,7 @@ def CheckoutRepo(boolean disableSubmodules = false) {
palRm('commitdate') palRm('commitdate')
} }
def HandleDriveMount(String snapshot, String repositoryName, String projectName, String pipeline, String branchName, String platform, String buildType, String workspace, boolean recreateVolume = false) { def HandleDriveMount(String snapshot, String repositoryName, String projectName, String pipeline, String branchName, String platform, String buildType, String workspace, boolean recreateVolume = false) {
unstash name: 'incremental_build_script' unstash name: 'incremental_build_script'
def pythonCmd = '' def pythonCmd = ''
@@ -435,7 +435,7 @@ def ExportTestScreenshots(Map options, String branchName, String platformName, S
} }
} }
def UploadAPLogs(Map options, String branchName, String jobName, String workspace, Map params) { def UploadAPLogs(Map options, String branchName, String platformName, String jobName, String workspace, Map params) {
dir("${workspace}/${ENGINE_REPOSITORY_NAME}") { dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
projects = params.CMAKE_LY_PROJECTS.split(",") projects = params.CMAKE_LY_PROJECTS.split(",")
projects.each{ project -> projects.each{ project ->
@@ -449,7 +449,7 @@ def UploadAPLogs(Map options, String branchName, String jobName, String workspac
} }
def command = "${pythonPath} -u ${s3UploadScriptPath} --base_dir ${apLogsPath} " + def command = "${pythonPath} -u ${s3UploadScriptPath} --base_dir ${apLogsPath} " +
"--file_regex \".*\" --bucket ${env.AP_LOGS_S3_BUCKET} " + "--file_regex \".*\" --bucket ${env.AP_LOGS_S3_BUCKET} " +
"--search_subdirectories True --key_prefix ${env.JENKINS_JOB_NAME}/${branchName}/${env.BUILD_NUMBER}/${jobName} " + "--search_subdirectories True --key_prefix ${env.JENKINS_JOB_NAME}/${branchName}/${env.BUILD_NUMBER}/${platformName}/${jobName} " +
'--extra_args {\\"ACL\\":\\"bucket-owner-full-control\\"}' '--extra_args {\\"ACL\\":\\"bucket-owner-full-control\\"}'
palSh(command, "Uploading AP logs for job ${jobName} for branch ${branchName}", false) palSh(command, "Uploading AP logs for job ${jobName} for branch ${branchName}", false)
} }
@@ -519,10 +519,10 @@ def CreateExportTestScreenshotsStage(Map pipelineConfig, String branchName, Stri
} }
} }
def CreateUploadAPLogsStage(Map pipelineConfig, String branchName, String jobName, String workspace, Map params) { def CreateUploadAPLogsStage(Map pipelineConfig, String branchName, String platformName, String jobName, String workspace, Map params) {
return { return {
stage("${jobName}_upload_ap_logs") { stage("${jobName}_upload_ap_logs") {
UploadAPLogs(pipelineConfig, branchName, jobName, workspace, params) UploadAPLogs(pipelineConfig, branchName, platformName, jobName, workspace, params)
} }
} }
} }
@@ -577,7 +577,7 @@ def CreateSingleNode(Map pipelineConfig, def platform, def build_job, Map envVar
} }
} }
if (IsAPLogUpload(branchName, build_job_name)) { if (IsAPLogUpload(branchName, build_job_name)) {
CreateUploadAPLogsStage(pipelineConfig, branchName, build_job_name, envVars['WORKSPACE'], platform.value.build_types[build_job_name].PARAMETERS).call() CreateUploadAPLogsStage(pipelineConfig, branchName, platform.key, build_job_name, envVars['WORKSPACE'], platform.value.build_types[build_job_name].PARAMETERS).call()
} }
// All other errors will be raised outside the retry block // All other errors will be raised outside the retry block
currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE' currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE'