From: Mike Marchetti Date: Sat, 15 Sep 2018 18:43:07 +0000 (-0400) Subject: Update uninstall_osm method X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fmulti_stack;p=osm%2Fdevops.git Update uninstall_osm method Change-Id: Ie5432a4c75187b77233b82fa6899e0d5031cab17 Signed-off-by: Mike Marchetti --- diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index e5da9016..44b8d766 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -40,7 +40,7 @@ properties([ ]) ]) -def uninstall_osm( stackName ) { +def uninstall_osm(stackName) { sh """ export OSM_USE_LOCAL_DEVOPS=true export PATH=$PATH:/snap/bin @@ -247,13 +247,13 @@ node("${params.NODE}") { if ( params.DO_INSTALL ) { if (error) { if ( !params.SAVE_CONTAINER_ON_FAIL ) { - uninstall_osm ${container_name} + uninstall_osm container_name } throw error } else { if ( !params.SAVE_CONTAINER_ON_PASS ) { - uninstall_osm ${container_name} + uninstall_osm container_name } } }