X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=64378d8ba7426383451824b3c6a4120fbca77f40;hb=39d42f8af98975685f50a0e17849dc231420a48e;hp=e0d6e0591070cdf34d416d299a49787ed02a9e15;hpb=3e868b5138fe2b70b86b1da240d044a9674bcc55;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index e0d6e059..64378d8b 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -38,7 +38,7 @@ properties([
         string(defaultValue: 'OSMETSI', description: '', name: 'GPG_KEY_NAME'),
         string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
         string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'),
-        string(defaultValue: 'releasesix-daily', description: '', name: 'DOCKER_TAG'),
+        string(defaultValue: 'releaseseven-daily', description: '', name: 'DOCKER_TAG'),
         booleanParam(defaultValue: true, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
         booleanParam(defaultValue: true, description: '', name: 'SAVE_ARTIFACTS_ON_SMOKE_SUCCESS'),
@@ -49,7 +49,8 @@ properties([
         booleanParam(defaultValue: true, description: '', name: 'DO_DOCKERPUSH'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_ARTIFACTS_OVERRIDE'),
         string(defaultValue: '/home/jenkins/hive/openstack-etsi.rc', description: '', name: 'HIVE_VIM_1'),
-        booleanParam(defaultValue: true, description: '', name: 'DO_ROBOT'),
+        booleanParam(defaultValue: false, description: '', name: 'DO_ROBOT'),
+        booleanParam(defaultValue: false, description: '', name: 'DO_RBAC'),
         string(defaultValue: 'sanity', description: 'smoke/vim/sanity/comprehensive are the options', name: 'TEST_NAME'),
         string(defaultValue: '/home/jenkins/hive/robot-systest.cfg', description: '', name: 'ROBOT_VIM'),
     ])
@@ -93,8 +94,8 @@ def run_robot_systest(stackName,tagName,testName,envfile=null) {
         disableArchiveOutput : false,
         reportFileName : "report.html",
         logFileName : "log.html",
-        passThreshold : 80,
-        unstableThreshold: 60.0,
+        passThreshold : 0,
+        unstableThreshold: 0,
         otherFiles : "*.png",
     ])
 }
@@ -309,16 +310,22 @@ node("${params.NODE}") {
                 stage_archive = false
                 stage("System Integration Test") {
                     if ( params.DO_ROBOT ) {
+                        if (params.DO_RBAC) {
+                            sh "docker service update ${container_name}_nbi --force --env-add OSMNBI_AUTHENTICATION_BACKEND=keystone --env-add OSMNBI_AUTHENTICATION_AUTH_URL=keystone --env-add OSMNBI_AUTHENTICATION_AUTH_PORT=5000 --env-add OSMNBI_AUTHENTICATION_USER_DOMAIN_NAME=default --env-add OSMNBI_AUTHENTICATION_PROJECT_DOMAIN_NAME=default --env-add OSMNBI_AUTHENTICATION_SERVICE_USERNAME=nbi --env-add OSMNBI_AUTHENTICATION_SERVICE_PROJECT=service"
+                            sh "installers/osm_health.sh -w 30 -s ${container_name}"
+                        }
                         run_robot_systest(container_name,container_name,params.TEST_NAME,params.ROBOT_VIM)
-                    } else {
-                        run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1)
-                    }
+                    } //else {
+                    run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1)
+                    //}
 
-                    if ( ! currentBuild.result.equals('UNSTABLE') ) {
+                    if ( ! currentBuild.result.equals('UNSTABLE') && ! currentBuild.result.equals('FAILURE')) {
                         stage_archive = keep_artifacts
                     } else {
+                       println ("Systest test failed, throwing error")
 					   error = new Exception("Systest test failed")
 					   currentBuild.result = 'FAILURE'
+					   throw error
 					}
                 }
             }
@@ -341,10 +348,11 @@ node("${params.NODE}") {
                 }
             }
         }
-        catch(caughtError) {
-            println("Caught error!")
-            error = caughtError
+        catch(Exception ex) {
+            error = ex
             currentBuild.result = 'FAILURE'
+            println("Caught error")
+            println(ex.getMessage())
         }
         finally {
             if ( params.DO_INSTALL ) {
@@ -354,7 +362,6 @@ node("${params.NODE}") {
                         sh "docker stop ${http_server_name}"
                         sh "docker rm ${http_server_name}"
                     }
-                    throw error 
                 }
                 else {
                     if ( !params.SAVE_CONTAINER_ON_PASS ) {