Update uninstall_osm method

[osm/devops.git] / jenkins / ci-pipelines / ci_stage_3.groovy

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 52aa3b2..44b8d76 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -40,6 +40,14 @@ properties([
     ])
 ])
 
+def uninstall_osm(stackName) {
+    sh """
+         export OSM_USE_LOCAL_DEVOPS=true
+         export PATH=$PATH:/snap/bin
+         installers/full_install_osm.sh -y -s ${stackName} --test --nolxd --nodocker --nojuju --nohostports --nohostclient --uninstall
+       """
+}
+
 node("${params.NODE}") {
 
     sh 'env'
@@ -179,8 +187,8 @@ node("${params.NODE}") {
                 }
          
                 sh """
-                    export OSM_USE_LOCAL_DEVOPS=true
-                    jenkins/host/start_build system --build-container ${container_name} \
+                    export PATH=$PATH:/snap/bin
+                    installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \
                                                     ${commit_id} \
                                                     ${repo_distro} \
                                                     ${repo_base_url} \
@@ -234,16 +242,19 @@ node("${params.NODE}") {
     }
     finally {
         sh "docker stop ${http_server_name}"
+        sh "docker rm ${http_server_name}"
 
-        if (error) {
-            if ( !params.SAVE_CONTAINER_ON_FAIL ) {
-                sh "lxc delete ${container_name} --force"
+        if ( params.DO_INSTALL ) {
+            if (error) {
+                if ( !params.SAVE_CONTAINER_ON_FAIL ) {
+                    uninstall_osm container_name
+                }
+                throw error 
             }
-            throw error 
-        }
-        else {
-            if ( !params.SAVE_CONTAINER_ON_PASS ) {
-                sh "lxc delete ${container_name} --force"
+            else {
+                if ( !params.SAVE_CONTAINER_ON_PASS ) {
+                    uninstall_osm container_name
+                }
             }
         }
     }