Add smoke/health tests to OSM stage_3

[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 65b9dcc..64a71a5 100644 (file)
--- 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'),
     ])
 ])
@@ -49,6 +49,15 @@ def uninstall_osm(stackName) {
        """
 }
 
+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'
@@ -209,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")
             }
         }