From: yadavmr Date: Wed, 13 Nov 2019 06:57:07 +0000 (+0530) Subject: Bug 883 - Disable build failure due to stage_4 robot test results X-Git-Tag: v7.0.0rc1~42 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F8159%2F2;p=osm%2Fdevops.git Bug 883 - Disable build failure due to stage_4 robot test results Change-Id: I0170cd0b890c27810efc90acd15f2831b918f4bc Signed-off-by: yadavmr --- diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index e0d6e059..e37cf200 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -93,8 +93,8 @@ def run_robot_systest(stackName,tagName,testName,envfile=null) { disableArchiveOutput : false, reportFileName : "report.html", logFileName : "log.html", - passThreshold : 80, - unstableThreshold: 60.0, + passThreshold : 0, + unstableThreshold: 0, otherFiles : "*.png", ]) } @@ -310,16 +310,18 @@ node("${params.NODE}") { stage("System Integration Test") { if ( params.DO_ROBOT ) { run_robot_systest(container_name,container_name,params.TEST_NAME,params.ROBOT_VIM) - } else { - run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1) - } + } //else { + run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1) + //} - if ( ! currentBuild.result.equals('UNSTABLE') ) { + if ( ! currentBuild.result.equals('UNSTABLE') && ! currentBuild.result.equals('FAILURE')) { stage_archive = keep_artifacts } else { - error = new Exception("Systest test failed") - currentBuild.result = 'FAILURE' - } + println ("Systest test failed, throwing error") + error = new Exception("Systest test failed") + currentBuild.result = 'FAILURE' + throw error + } } } @@ -341,10 +343,11 @@ node("${params.NODE}") { } } } - catch(caughtError) { - println("Caught error!") - error = caughtError + catch(Exception ex) { + error = ex currentBuild.result = 'FAILURE' + println("Caught error") + println(ex.getMessage()); } finally { if ( params.DO_INSTALL ) { @@ -354,7 +357,6 @@ node("${params.NODE}") { sh "docker stop ${http_server_name}" sh "docker rm ${http_server_name}" } - throw error } else { if ( !params.SAVE_CONTAINER_ON_PASS ) {