From 02362e927be653d0a8a63cd9cbbba0f0888075e1 Mon Sep 17 00:00:00 2001 From: madavi Date: Wed, 26 Jun 2019 15:15:18 +0530 Subject: [PATCH] Bug 745 preserve the logs temporarily for analysis fixedgit status Change-Id: Idc39b0bc71856305eecff1b17a33f0fb4eb12b2b Signed-off-by: madavi --- jenkins/ci-pipelines/ci_stage_3.groovy | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 283b042b..20840b52 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,12 @@ node("${params.NODE}") { { repo_base_url = "-u ${params.REPOSITORY_BASE}" } - + + // Jayant: bug 745 enabling the flag to keep container after failure. So the below + // code will do the cleanup of previous dockers, if any. + + 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 \ -- 2.25.1