Merge "barometer jjb: update for nightly RPM Build"

[releng.git] / jjb / 3rd_party_ci / odl-netvirt.yml

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index bf2ba6c..a937acb 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -12,6 +12,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+        - carbon:
+            branch: 'stable/carbon'
+            gs-pathname: ''
+            disabled: false
 #####################################
 # patch verification phases
 #####################################
@@ -62,7 +66,7 @@
             branch: '{branch}'
         - string:
             name: NETVIRT_ARTIFACT
-            default: $WORKSPACE/distribution-karaf.tar.gz
+            default: distribution-karaf.tar.gz
         - 'odl-netvirt-virtual-intel-defaults'
 
     triggers:
@@ -111,6 +115,7 @@
                 - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    ODL_BRANCH={branch}
                     BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -125,10 +130,11 @@
             name: functest
             condition: SUCCESSFUL
             projects:
-                - name: 'functest-netvirt-virtual-suite-{stream}'
+                - name: 'functest-netvirt-virtual-suite-master'
                   predefined-parameters: |
                     DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
-                    FUNCTEST_SUITE_NAME=healthcheck
+                    FUNCTEST_SUITE_NAME=odl_netvirt
+                    RC_FILE_PATH=$HOME/cloner-info/overcloudrc
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: false