X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2F3rd_party_ci%2Fodl-netvirt.yml;h=a57bf176e9cbfba36f058d73a394c008da26f2e2;hb=b67046c7b27e75a20e21cb452b8a897a0b759bed;hp=3dd4c0b44ba9670d01527fd37fd12cc707f51cc3;hpb=4fbf1fa53a95d4af82a826c6d2dd6b49a63fd319;p=releng.git

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 3dd4c0b44..a57bf176e 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -3,7 +3,7 @@
 
     project: 'netvirt'
 
-    installer: 'apex'
+    installer: 'netvirt'
 #####################################
 # branch definitions
 #####################################
@@ -20,8 +20,6 @@
             slave-label: 'ericsson-virtual5'
         - 'install-netvirt':
             slave-label: 'odl-netvirt-virtual'
-        - 'functest':
-            slave-label: 'odl-netvirt-virtual'
         - 'postprocess':
             slave-label: 'odl-netvirt-virtual'
 #####################################
@@ -43,6 +41,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 5
@@ -119,10 +118,10 @@
             name: functest
             condition: SUCCESSFUL
             projects:
-                - name: 'functest-netvirt-virtual-suite-{stream}'
+                - name: 'functest-netvirt-virtual-daily-{stream}'
                   predefined-parameters: |
-                    FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn
                     RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc
+                    DEPLOY_SCENARIO=os-odl_l2-bgpvpn-noha
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: false
@@ -152,6 +151,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 5
@@ -161,14 +161,12 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'odl-netvirt-verify-virtual-install-.*'
-                - 'odl-netvirt-verify-virtual-functest-.*'
+                - 'functest-netvirt-virtual-daily-.*'
                 - 'odl-netvirt-verify-virtual-postprocess-.*'
             block-level: 'NODE'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
@@ -180,6 +178,10 @@
             branch: '{branch}'
         - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-bgpvpn-noha'
+            description: 'Scenario to deploy and test'
 
     builders:
         - description-setter:
@@ -200,11 +202,6 @@
             !include-raw: ./download-netvirt-artifact.sh
         - shell:
             !include-raw: ./install-netvirt.sh
-- builder:
-    name: 'netvirt-verify-functest-builder'
-    builders:
-        - shell:
-            !include-raw: ./functest-netvirt.sh
 - builder:
     name: 'netvirt-verify-postprocess-builder'
     builders: