X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=9ea2d7f23a5f7bc3927cf0204abe71d7a5a161dc;hb=refs%2Fchanges%2F02%2F5702%2F1;hp=082f7283a5a3b70724b04a4780ab7039d24fe488;hpb=49461294d0896c910a93aa18e20ba10f6bef38b3;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 082f7283..9ea2d7f2 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -30,8 +30,10 @@ properties([ string(defaultValue: '', description: '', name: 'UPSTREAM_JOB_NUMBER'), string(defaultValue: 'dpkg1', description: '', name: 'GPG_KEY_NAME'), string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'), + string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'), booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'), - booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS') + booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'), + booleanParam(defaultValue: false, description: '', name: 'DO_STAGE_4'), ]) ]) @@ -181,11 +183,22 @@ node("${params.NODE}") { """ } - stage("Test") { + stage("Smoke") { ci_helper.systest_run(container_name, 'smoke') junit '*.xml' } + if ( params.DO_STAGE_4 ) { + stage("stage_4") { + def downstream_params = [ + string(name: 'CONTAINER_NAME', value: container_name), + ] + stage_4_result = build job: "${params.DOWNSTREAM_STAGE_NAME}/${GERRIT_BRANCH}", parameters: downstream_params, propagate: false + + currentBuild.result = stage_4_result.result + } + } + // save the artifacts of this build if this is a merge job if ( save_artifacts ) { stage("Archive") { @@ -200,6 +213,7 @@ node("${params.NODE}") { } } catch(caughtError) { + println("Caught error!") error = caughtError currentBuild.result = 'FAILURE' }