From: madavi <jm00553988@techmahindra.com>
Date: Mon, 1 Jul 2019 11:23:08 +0000 (+0530)
Subject: improvement to 792, exception remove during docker rm
X-Git-Tag: v6.0.1^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=310c1e1dffd2233d5ca474b8153e7f880cda48ca;p=osm%2Fdevops.git

improvement to 792, exception remove during docker rm

Change-Id: Ia4e9810d7d8ca86fbd60523cc32e6df2ae07c31b
Signed-off-by: madavi <jm00553988@techmahindra.com>
---

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index e6264e59..935c6708 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -230,7 +230,12 @@ node("${params.NODE}") {
                         repo_base_url = "-u ${params.REPOSITORY_BASE}"
                     }
 					if ( params.DO_STAGE_4 ) {
-                        sh "docker stack list | grep v60 | awk '{ print \$1 }'| xargs docker stack rm"
+					try {
+                        sh "docker stack list | grep v60 | awk '{ print \$1 }'| xargs docker stack rm "
+						}
+						catch (caughtError) {
+						 println("FAILURE:: Docker remove gave exception, pls check & remove old dockers manually, if required !!!")
+						}
 					}
                     sh """
                         export PATH=$PATH:/snap/bin