replace testing agent CD-test with CD
This commit is contained in:
parent
1ec74a8d79
commit
2d0ff0d202
|
@ -80,9 +80,7 @@ pipeline {
|
|||
|
||||
// see https://jenkins.io/doc/book/pipeline/syntax/#agent
|
||||
agent {
|
||||
// label 'CD'
|
||||
// just for test I'm going to use the following label
|
||||
label 'CD-test'
|
||||
label 'CD'
|
||||
}
|
||||
|
||||
// see https://jenkins.io/doc/book/pipeline/syntax/#environment
|
||||
|
@ -196,15 +194,15 @@ pipeline {
|
|||
stage('build maven-parent') {
|
||||
steps {
|
||||
script {
|
||||
if (jobs['maven-parent_branch'] == 'SUCCESS') {
|
||||
if (jobs['maven-parent'] == 'SUCCESS') {
|
||||
echo "Skipping maven-parent"
|
||||
// propagate success
|
||||
sh "echo -e maven-parent,SUCCESS >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
|
||||
} else {
|
||||
def gjob = build(job: 'maven-parent_branch', wait: true, propagate: true,
|
||||
def gjob = build(job: 'maven-parent', wait: true, propagate: true,
|
||||
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']]
|
||||
[$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
|
||||
])
|
||||
sh "echo -e maven-parent,${gjob.getResult()} >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
|
||||
echo "Done with maven-parent"
|
||||
|
@ -295,7 +293,7 @@ def buildComponents(args, maven_settings_file, maven_activation_property, maven_
|
|||
def gjob = build(job: name, wait: true, propagate: true,
|
||||
parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_settings_file} ${maven_activation_property}"],
|
||||
[$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}"],
|
||||
[$class: 'LabelParameterValue', name: 'exec_label', label: "CD-test", nodeEligibility: [$class: 'AllNodeEligibility']]
|
||||
[$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
|
||||
])
|
||||
sh "echo -e ${name},${gjob.getResult()} >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue