X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2F3rd_party_ci%2Fodl-netvirt.yml;h=4a65dcbb7c2c33d3a6fd54f9c4e2aebd8b46be77;hb=b2bc05dad00f551cdcaa10c4f3864adc67639dbf;hp=0948353aa56841136e1b4ae119cb584cf91d6aa6;hpb=d298029ded18eb39ceec4d198ba8ca83d2f21709;p=releng.git

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 0948353aa..4a65dcbb7 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -19,11 +19,11 @@
         - 'create-apex-vms':
             slave-label: 'ericsson-virtual5'
         - 'install-netvirt':
-            slave-label: 'ericsson-virtual6'
+            slave-label: 'odl-netvirt-virtual'
         - 'functest':
-            slave-label: 'ericsson-virtual6'
+            slave-label: 'odl-netvirt-virtual'
         - 'postprocess':
-            slave-label: 'ericsson-virtual6'
+            slave-label: 'odl-netvirt-virtual'
 #####################################
 # jobs
 #####################################
@@ -57,7 +57,7 @@
         - string:
             name: NETVIRT_ARTIFACT
             default: $WORKSPACE/distribution-karaf.tar.gz
-        - 'ericsson-virtual6-defaults'
+        - 'odl-netvirt-virtual-defaults'
 
     triggers:
         - gerrit:
@@ -119,22 +119,16 @@
             name: functest
             condition: SUCCESSFUL
             projects:
-                - name: 'odl-netvirt-verify-virtual-functest-{stream}'
-                  current-parameters: false
+                - name: 'functest-netvirt-virtual-suite-{stream}'
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
-                    GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
-                    GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
-                    NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
+                    FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn
+                    RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc
                   node-parameters: true
                   kill-phase-on: FAILURE
-                  abort-all-job: true
+                  abort-all-job: false
         - multijob:
             name: postprocess
-            condition: SUCCESSFUL
+            condition: ALWAYS
             projects:
                 - name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
                   current-parameters: false
@@ -172,9 +166,7 @@
             block-level: 'NODE'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true