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 6e25425..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
 #####################################
@@ -48,14 +52,22 @@
             max-per-node: 1
             option: 'project'
 
+    scm:
+        - git:
+            url: https://gerrit.opnfv.org/gerrit/apex
+            branches:
+                - 'origin/master'
+            timeout: 15
+            wipe-workspace: true
+
     parameters:
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
         - string:
             name: NETVIRT_ARTIFACT
-            default: $WORKSPACE/distribution-karaf.tar.gz
-        - 'odl-netvirt-virtual-defaults'
+            default: distribution-karaf.tar.gz
+        - 'odl-netvirt-virtual-intel-defaults'
 
     triggers:
         - gerrit:
@@ -93,7 +105,7 @@
                     GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
                     NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
                     APEX_ENV_NUMBER=$APEX_ENV_NUMBER
-                  node-parameters: false
+                  node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
@@ -103,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
@@ -117,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
@@ -171,6 +185,14 @@
             timeout: 360
             fail: true
 
+    scm:
+        - git:
+            url: https://gerrit.opnfv.org/gerrit/apex
+            branches:
+                - 'origin/master'
+            timeout: 15
+            wipe-workspace: true
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -181,6 +203,10 @@
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-bgpvpn-noha'
             description: 'Scenario to deploy and test'
+        - string:
+            name: GS_URL
+            default: artifacts.opnfv.org/apex
+            description: "URL to Google Storage with snapshot artifacts."
 
     builders:
         - description-setter: