X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_1.groovy;h=8bc6ac58ff11d12daf9f42d511e7d550e4f6d679;hb=4a7a23cdf44402d3be70b491049129b0b28ed02f;hp=0f530c5269f35ade9685fda49f145692005e3450;hpb=f1492c324f3be50c6a7b3d421b7f040ac8d1c8fe;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy index 0f530c52..8bc6ac58 100644 --- a/jenkins/ci-pipelines/ci_stage_1.groovy +++ b/jenkins/ci-pipelines/ci_stage_1.groovy @@ -59,12 +59,6 @@ node("${params.NODE}") { println("No gerrit event found") } - do_stage_4 = false - if (params.DO_STAGE_4) - { - do_stage_4 = params.DO_STAGE_4 - } - // pipeline running from gerrit trigger. // kickoff the downstream multibranch pipeline def downstream_params = [ @@ -75,10 +69,16 @@ node("${params.NODE}") { string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX), string(name: 'DOCKER_TAG', value: params.DOCKER_TAG), booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL), - booleanParam(name: 'DO_ROBOT', value: params.DO_ROBOT), - booleanParam(name: 'DO_STAGE_4', value: do_stage_4), ] - + if ( params.DO_ROBOT ) + { + downstream_params.add(booleanParam(name: 'DO_ROBOT', value: params.DO_ROBOT)) + } + if ( params.ROBOT_TAG_NAME ) + { + downstream_params.add(string(name: 'ROBOT_TAG_NAME', value: params.ROBOT_TAG_NAME)) + } + if ( params.STAGE ) { // go directly to stage 3 (osm system) @@ -89,6 +89,8 @@ node("${params.NODE}") { println("disabling stage_3 invocation") return } + // in this case, since this is for daily jobs, the pass threshold for robot tests should be adapted + downstream_params.add(string(name: 'ROBOT_PASS_THRESHOLD', value: '99.0')) } // callout to stage_2. This is a multi-branch pipeline. downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}" @@ -101,8 +103,8 @@ node("${params.NODE}") { project = stage_3_merge_result.getProjectName() build = stage_3_merge_result.getNumber() // Jayant if the build fails the below error will cause the pipeline to terminate. - // error("${project} build ${build} failed") - currentBuild.result = stage_3_merge_result.getResult() + // error("${project} build ${build} failed") + currentBuild.result = stage_3_merge_result.getResult() } } catch(caughtError) { @@ -111,7 +113,7 @@ node("${params.NODE}") { } finally { try { - if((currentBuild.result != 'SUCCESS') && (env.JOB_NAME == 'daily-stage_4')){ + if ((currentBuild.result != 'SUCCESS') && (env.JOB_NAME.startsWith('daily-stage_4'))){ emailext ( subject: "[OSM-Jenkins] Job: ${env.JOB_NAME} Build: ${env.BUILD_NUMBER} Result: ${currentBuild.result}", body: """ Check console output at "${env.BUILD_URL}" """,