X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=1f600535faf3c7c9daa9bab4234c7259a83fac5a;hb=7334f68a8186a8a0e78f72422bba3fda42e0152b;hp=e37cf200b7ae70c2457e08216c6bf5133f629fda;hpb=4c100eb1e1163d48c8c8d5ed7abc494f5a3d7986;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index e37cf200..1f600535 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: 'testing-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,7 @@ 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'),
         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'),
     ])
@@ -135,7 +135,7 @@ node("${params.NODE}") {
             // grab all stable upstream builds based on the
 
             dir("${RELEASE}") {
-                def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI"]
+                def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI", "NG-UI", "PLA", "tests"]
                 for (component in list) {
                     step ([$class: 'CopyArtifact',
                            projectName: "${component}${upstream_main_job}/${GERRIT_BRANCH}"])
@@ -317,11 +317,11 @@ node("${params.NODE}") {
                     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
-                    }
+                       println ("Systest test failed, throwing error")
+					   error = new Exception("Systest test failed")
+					   currentBuild.result = 'FAILURE'
+					   throw error
+					}
                 }
             }
 
@@ -347,7 +347,7 @@ node("${params.NODE}") {
             error = ex
             currentBuild.result = 'FAILURE'
             println("Caught error")
-            println(ex.getMessage());
+            println(ex.getMessage())
         }
         finally {
             if ( params.DO_INSTALL ) {