X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=64a71a534753bce18e5cb387228a84ef2255ed1a;hb=851aac2e9fea85ceb75e58d1557e931f55197237;hp=1b4dc13e4d9b1448ed0ea13c865faff1b858ccac;hpb=7f18603f3b20316ea0be94c5c2e3c06b8b737fc4;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 1b4dc13e..64a71a53 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -35,8 +35,8 @@ properties([
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
         booleanParam(defaultValue: false, description: '', name: 'DO_STAGE_4'),
         booleanParam(defaultValue: true, description: '',  name: 'DO_BUILD'),
-        booleanParam(defaultValue: false, description: '', name: 'DO_INSTALL'),
-        booleanParam(defaultValue: false, description: '', name: 'DO_SMOKE'),
+        booleanParam(defaultValue: true, description: '', name: 'DO_INSTALL'),
+        booleanParam(defaultValue: true, description: '', name: 'DO_SMOKE'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_ARTIFACTS_OVERRIDE'),
     ])
 ])
@@ -45,10 +45,19 @@ 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
+         installers/full_install_osm.sh -y -w /tmp/osm -t ${stackName} -s ${stackName} --test --nolxd --nodocker --nojuju --nohostports --nohostclient --uninstall
        """
 }
 
+def run_systest(stackName,tagName,testName) {
+    sh """
+        tempdir=$(mktemp -d)
+        docker run -ti --network net${stackName} -v $tempdir:/usr/share/osm-devops/systest/reports osm/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}
+        cp $tempdir/*.xml .
+       """
+    junit  '*.xml'
+}
+
 node("${params.NODE}") {
 
     sh 'env'
@@ -156,6 +165,7 @@ node("${params.NODE}") {
     error = null
     if ( params.DO_BUILD ) {
         stage("Build") {
+            sh "make -C docker clean"
             sh "make -j4 -C docker CMD_DOCKER_ARGS= TAG=${container_name} RELEASE=${params.RELEASE} REPOSITORY_BASE=${repo_base_url} REPOSITORY_KEY=${params.REPO_KEY_NAME} REPOSITORY=${params.REPO_DISTRO}"
         }
     }
@@ -196,6 +206,7 @@ node("${params.NODE}") {
                     export PATH=$PATH:/snap/bin
                     installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \
                                                     --nodockerbuild -t ${container_name} \
+                                                    -w /tmp/osm \
                                                     ${commit_id} \
                                                     ${repo_distro} \
                                                     ${repo_base_url} \
@@ -207,9 +218,11 @@ node("${params.NODE}") {
         }
 
         if ( params.DO_SMOKE ) {
+            stage("OSM Health") {
+                sh "installers/osm_health.sh -s ${container_name}"
+            }
             stage("Smoke") {
-                ci_helper.systest_run(container_name, 'smoke')
-                junit '*.xml'
+                run_systest(container_name,container_name,"smoke")
             }
         }