From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Sat, 15 Sep 2018 17:10:06 +0000 (-0400)
Subject: Use local version of devops
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b7c442c64ecc44e811c322b9b5f0851802073d8e;p=osm%2Fdevops.git

Use local version of devops

Change-Id: Ic1fe22bb50416d967a6c296ba42dc63a7fee53ef
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index e0bfafa6..a853f998 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -172,6 +172,7 @@ EONG
         remove_network $OSM_STACK_NAME
         echo "Removing $OSM_DOCKER_WORK_DIR"
         rm -rf $OSM_DOCKER_WORK_DIR
+        sg lxd -c "juju destroy-controller --yes $OSM_STACK_NAME"
     fi
     echo "Some docker images will be kept in case they are used by other docker stacks"
     echo "To remove them, just run 'docker image prune' in a terminal"
diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 2c8af42b..e5da9016 100644
--- 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,9 +187,8 @@ 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 --nohostclient \
+                    installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \
                                                     ${commit_id} \
                                                     ${repo_distro} \
                                                     ${repo_base_url} \
@@ -240,15 +247,13 @@ node("${params.NODE}") {
         if ( params.DO_INSTALL ) {
             if (error) {
                 if ( !params.SAVE_CONTAINER_ON_FAIL ) {
-                    sh "docker stack rm ${container_name}"
-                    sh "export PATH=$PATH:/snap/bin; juju destroy-controller ${container_name}"
+                    uninstall_osm ${container_name}
                 }
                 throw error 
             }
             else {
                 if ( !params.SAVE_CONTAINER_ON_PASS ) {
-                    sh "docker stack rm ${container_name}"
-                    sh "export PATH=$PATH:/snap/bin; juju destroy-controller ${container_name}"
+                    uninstall_osm ${container_name}
                 }
             }
         }