X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;fp=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=2c8af42b07aa41dc3689e50caecfcafe7ea3e43b;hb=972947c4155045d9d05f9a4a3cce081164c20dab;hp=d7b37655a75ebc8272eda95861187d3ec72eeb36;hpb=e6b9509c4a14a82d85493e0d2750a35cb6ca5fb4;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index d7b37655..2c8af42b 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -181,7 +181,7 @@ node("${params.NODE}") {
                 sh """
                     export OSM_USE_LOCAL_DEVOPS=true
                     export PATH=$PATH:/snap/bin
-                    installers/full_install_osm.sh -y -s ${container_name} --nolxd --nodocker --nojuju --nohostports \
+                    installers/full_install_osm.sh -y -s ${container_name} --nolxd --nodocker --nojuju --nohostports --nohostclient \
                                                     ${commit_id} \
                                                     ${repo_distro} \
                                                     ${repo_base_url} \
@@ -235,17 +235,20 @@ node("${params.NODE}") {
     }
     finally {
         sh "docker stop ${http_server_name}"
+        sh "docker rm ${http_server_name}"
 
         if ( params.DO_INSTALL ) {
             if (error) {
                 if ( !params.SAVE_CONTAINER_ON_FAIL ) {
-                    sh "lxc delete ${container_name} --force"
+                    sh "docker stack rm ${container_name}"
+                    sh "export PATH=$PATH:/snap/bin; juju destroy-controller ${container_name}"
                 }
                 throw error 
             }
             else {
                 if ( !params.SAVE_CONTAINER_ON_PASS ) {
-                    sh "lxc delete ${container_name} --force"
+                    sh "docker stack rm ${container_name}"
+                    sh "export PATH=$PATH:/snap/bin; juju destroy-controller ${container_name}"
                 }
             }
         }