X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=44b8d7664a28c703b04003e22a35ab117d07113e;hb=refs%2Fheads%2Fmulti_stack;hp=3da04227185c8978823259c4f10faf2c82b0f6c5;hpb=e580dd9b3c2b5511f9508243ac01b564f0bdfcd7;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 3da04227..44b8d766 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -34,10 +34,20 @@ properties([
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
         booleanParam(defaultValue: false, description: '', name: 'DO_STAGE_4'),
+        booleanParam(defaultValue: false, description: '', name: 'DO_INSTALL'),
+        booleanParam(defaultValue: false, description: '', name: 'DO_SMOKE'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_ARTIFACTS_OVERRIDE'),
     ])
 ])
 
+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'
@@ -69,7 +79,7 @@ node("${params.NODE}") {
             // grab all stable upstream builds based on the
 
             dir("${RELEASE}") {
-                def list = ["SO", "UI", "RO", "openvim", "osmclient", "IM", "devops"]
+                def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM"]
                 for (component in list) {
                     step ([$class: 'CopyArtifact',
                            projectName: "${component}${upstream_main_job}/${GERRIT_BRANCH}"])
@@ -145,51 +155,55 @@ node("${params.NODE}") {
     error = null
 
     try {
-        stage("Install") {
+        if ( params.DO_INSTALL ) {
+            stage("Install") {
 
-            //will by default always delete containers on complete
-            //sh "jenkins/system/delete_old_containers.sh ${container_name_prefix}"
+                //will by default always delete containers on complete
+                //sh "jenkins/system/delete_old_containers.sh ${container_name_prefix}"
 
-            commit_id = ''
-            repo_distro = ''
-            repo_key_name = ''
-            release = ''
+                commit_id = ''
+                repo_distro = ''
+                repo_key_name = ''
+                release = ''
 
-            if ( params.COMMIT_ID )
-            {
-                commit_id = "-b ${params.COMMIT_ID}"
-            }
+                if ( params.COMMIT_ID )
+                {
+                    commit_id = "-b ${params.COMMIT_ID}"
+                }
 
-            if ( params.REPO_DISTRO )
-            {
-                repo_distro = "-r ${params.REPO_DISTRO}"
-            }
+                if ( params.REPO_DISTRO )
+                {
+                    repo_distro = "-r ${params.REPO_DISTRO}"
+                }
 
-            if ( params.REPO_KEY_NAME )
-            {
-                repo_key_name = "-k ${params.REPO_KEY_NAME}"
-            }
+                if ( params.REPO_KEY_NAME )
+                {
+                    repo_key_name = "-k ${params.REPO_KEY_NAME}"
+                }
 
-            if ( params.RELEASE )
-            {
-                release = "-R ${params.RELEASE}"
+                if ( params.RELEASE )
+                {
+                    release = "-R ${params.RELEASE}"
+                }
+         
+                sh """
+                    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} \
+                                                    ${repo_key_name} \
+                                                    ${release} \
+                                                    ${params.BUILD_FROM_SOURCE}
+                   """
             }
-     
-            sh """
-                export OSM_USE_LOCAL_DEVOPS=true
-                jenkins/host/start_build system --build-container ${container_name} \
-                                                ${commit_id} \
-                                                ${repo_distro} \
-                                                ${repo_base_url} \
-                                                ${repo_key_name} \
-                                                ${release} \
-                                                ${params.BUILD_FROM_SOURCE}
-               """
         }
 
-        stage("Smoke") {
-            ci_helper.systest_run(container_name, 'smoke')
-            junit '*.xml'
+        if ( params.DO_SMOKE ) {
+            stage("Smoke") {
+                ci_helper.systest_run(container_name, 'smoke')
+                junit '*.xml'
+            }
         }
 
         stage_4_archive = false
@@ -228,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
+                }
             }
         }
     }