From: madavi <jm00553988@techmahindra.com>
Date: Wed, 26 Jun 2019 20:01:22 +0000 (+0530)
Subject: bug 745 re checkin after issues
X-Git-Tag: v7.0.0rc1~101
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=0e4afd3e809c80e5447b12cb4b460688f06ccd0e;p=osm%2Fdevops.git

bug 745 re checkin after issues

Change-Id: Ifd6ef79acd43a7e7b09a2fc8a9203578bb86534a
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 283b042b..b698bc29 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -32,7 +32,7 @@ properties([
         string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
         string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'),
         string(defaultValue: 'releasesix-daily', description: '', name: 'DOCKER_TAG'),
-        booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
+        booleanParam(defaultValue: true, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
         booleanParam(defaultValue: true, description: '', name: 'SAVE_ARTIFACTS_ON_SMOKE_SUCCESS'),
         booleanParam(defaultValue: true, description: '', name: 'DO_STAGE_4'),
@@ -229,7 +229,7 @@ node("${params.NODE}") {
                     {
                         repo_base_url = "-u ${params.REPOSITORY_BASE}"
                     }
-             
+                    sh "docker stack list |  awk '{ print \$1 }'| xargs docker stack rm"
                     sh """
                         export PATH=$PATH:/snap/bin
                         installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \