remove var maven_parent_file, set new settings files
This commit is contained in:
parent
768b96909c
commit
ccb2183ff8
|
@ -10,25 +10,25 @@ if (params.Type == 'SNAPSHOT-DRY-RUN') {
|
|||
echo "Configure Maven for SNAPSHOT-DRY-RUN artifacts"
|
||||
options = ''
|
||||
maven_local_repo_path = "local-snapshots"
|
||||
maven_settings_file = "jenkins-snapshots-dry-run-settings.xml"
|
||||
maven_settings_file = "gcube-settings.xml"
|
||||
maven_activation_property="-Pdry-run";
|
||||
maven_parent_file = "jenkins-snapshots-dry-run-settings.xml"
|
||||
// maven_parent_file = "jenkins-snapshots-dry-run-settings.xml"
|
||||
}
|
||||
if (params.Type == 'SNAPSHOT') {
|
||||
echo "Configure Maven for SNAPSHOT artifacts"
|
||||
options = ''
|
||||
maven_local_repo_path = "local-snapshots"
|
||||
maven_settings_file = "jenkins-snapshots-settings.xml"
|
||||
maven_settings_file = "gcube-settings.xml"
|
||||
maven_activation_property='';
|
||||
maven_parent_file = "jenkins-snapshots-dry-run-settings.xml"
|
||||
// maven_parent_file = "jenkins-snapshots-dry-run-settings.xml"
|
||||
}
|
||||
if (params.Type == 'RELEASE-DRY-RUN') {
|
||||
echo "Configure Maven for RELEASE-DRY-RUN artifacts"
|
||||
options = ''
|
||||
maven_local_repo_path = "local-releases"
|
||||
maven_settings_file = "jenkins-releases-dry-run-settings.xml"
|
||||
maven_settings_file = "jenkins-releases-settings.xml"
|
||||
maven_activation_property="-Pdry-run -Djenkins-releases -DRelease";
|
||||
maven_parent_file = "jenkins-releases-dry-run-settings.xml"
|
||||
// maven_parent_file = "jenkins-releases-dry-run-settings.xml"
|
||||
}
|
||||
if (params.Type == 'STAGING') {
|
||||
echo "Configure Maven for STAGING artifacts"
|
||||
|
@ -36,7 +36,7 @@ if (params.Type == 'STAGING') {
|
|||
maven_local_repo_path = "local-staging"
|
||||
maven_settings_file = "jenkins-staging-settings.xml"
|
||||
maven_activation_property="-Djenkins-staging -DRelease";
|
||||
maven_parent_file = "jenkins-staging-dry-run-settings.xml"
|
||||
// maven_parent_file = "jenkins-staging-dry-run-settings.xml"
|
||||
}
|
||||
if (params.Type == 'RELEASE') {
|
||||
echo "Configure Maven for RELEASE artifacts"
|
||||
|
@ -44,7 +44,7 @@ if (params.Type == 'RELEASE') {
|
|||
maven_local_repo_path = "local-releases"
|
||||
maven_settings_file = "jenkins-releases-settings.xml"
|
||||
maven_activation_property="-Djenkins-releases -DRelease";
|
||||
maven_parent_file = "jenkins-releases-dry-run-settings.xml"
|
||||
// maven_parent_file = "jenkins-releases-dry-run-settings.xml"
|
||||
}
|
||||
|
||||
echo "Use settings file at ${maven_settings_file} with the following activation property: ${maven_activation_property}"
|
||||
|
@ -208,7 +208,7 @@ pipeline {
|
|||
sh "echo -e maven-parent,SUCCESS >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
|
||||
} else {
|
||||
def gjob = build(job: 'maven-parent', wait: true, propagate: true,
|
||||
parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_parent_file}"],
|
||||
parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_settings_file} -Pdry-run"],
|
||||
[$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}"],
|
||||
[$class: 'LabelParameterValue', name: 'exec_label', label: "CD-test", nodeEligibility: [$class: 'AllNodeEligibility']]
|
||||
])
|
||||
|
|
Loading…
Reference in New Issue