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

Allow customized Jenkins parameters for different pipelines and add aws integration deployment pipeline (#3248)

Browse Source 
Allow customized Jenkins parameters for different pipelines so that we can define different Jenkins parameters for a new pipeline and doesn't affect AR build parameters.

Add aws integration deployment pipeline.
This commit is contained in:
Shirang Jia
2021-08-17 15:25:32 -07:00
committed by GitHub
parent 401d0c1ad5
commit 3e51240a05
3 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/Jenkins/Jenkinsfile
Vendored
+34
View File
@@ -634,6 +634,40 @@ try {
pipelineParameters.add(booleanParam(defaultValue: true, description: '', name: platform.key))
}
}
// Add additional Jenkins parameters
pipelineConfig.platforms.each { platform ->
platformEnv = platform.value.PIPELINE_ENV
pipelineJenkinsParameters = platformEnv['PIPELINE_JENKINS_PARAMETERS'] ?: [:]
jenkinsParametersToAdd = pipelineJenkinsParameters[pipelineName] ?: [:]
jenkinsParametersToAdd.each{ jenkinsParameter ->
defaultValue = jenkinsParameter['default_value']
// Use last run's value as default value so we can save values in different Jenkins environment
if (jenkinsParameter['use_last_run_value']?.toBoolean()) {
defaultValue = params."$jenkinsParameter['parameter_name']" ?: jenkinsParameter['default_value']
}
switch (jenkinsParameter['parameter_type']) {
case 'string':
pipelineParameters.add(stringParam(defaultValue: defaultValue,
description: jenkinsParameter['description'],
name: jenkinsParameter['parameter_name']
))
break
case 'boolean':
pipelineParameters.add(booleanParam(defaultValue: defaultValue,
description: jenkinsParameter['description'],
name: jenkinsParameter['parameter_name']
))
break
case 'password':
pipelineParameters.add(password(defaultValue: defaultValue,
description: jenkinsParameter['description'],
name: jenkinsParameter['parameter_name']
))
break
}
}
}
pipelineProperties.add(parameters(pipelineParameters))
properties(pipelineProperties)
scripts/build/Platform/Windows/build_config.json
+5
View File
@@ -376,5 +376,10 @@
"install_profile_vs2019",
"project_engineinstall_profile_vs2019"
]
},
"awsi_deployment": {
"TAGS": ["awsi-deployment"],
"COMMAND": "deploy_cdk_applications.cmd",
"PARAMETERS": {}
}
}
scripts/build/Platform/Windows/pipeline.json
+32
View File
@@ -16,5 +16,37 @@
"nightly-clean": {
"CLEAN_WORKSPACE": true
}
},
"PIPELINE_JENKINS_PARAMETERS": {
"awsi-deployment": [
{
"parameter_name": "O3DE_AWS_PROJECT_NAME",
"parameter_type": "string",
"default_value": "",
"use_last_run_value": true,
"description": ""
},
{
"parameter_name": "O3DE_AWS_DEPLOY_REGION",
"parameter_type": "string",
"default_value": "",
"use_last_run_value": true,
"description": ""
},
{
"parameter_name": "ASSUME_ROLE_ARN",
"parameter_type": "string",
"default_value": "",
"use_last_run_value": true,
"description": ""
},
{
"parameter_name": "COMMIT_ID",
"parameter_type": "string",
"default_value": "",
"use_last_run_value": true,
"description": ""
}
]
}
}