X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2F3rd_party_ci%2Fodl-netvirt.yaml;h=15d28486fd0e8079e28cc2da4ebfef7ee15a6ebc;hb=1e0279434d929c543cde79d4ffce731522f487c9;hp=62e4ca198142ed8ca0b33a9d4f012020a2f4c7e7;hpb=a1be8f9e82281c439d689292259a4f2005a5f4a2;p=releng.git

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index 62e4ca198..15d28486f 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yaml
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -63,7 +63,7 @@
             - 'odl-netvirt-verify-virtual-install-netvirt-.*'
             - 'functest-netvirt-virtual-suite-.*'
             - 'odl-netvirt-verify-virtual-postprocess-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
     scm:
       - git:
           url: https://gerrit.opnfv.org/gerrit/apex
@@ -95,7 +95,7 @@
                 comment-contains-value: 'check-opnfv'
           projects:
             - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+              project-pattern: '*'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
@@ -142,6 +142,7 @@
                 GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
                 GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
                 GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
+                GERRIT_PROJECT=$GERRIT_PROJECT
                 NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
                 TOPOLOGY=$TOPOLOGY
                 OS_VERSION=$OS_VERSION
@@ -149,33 +150,41 @@
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: functest
-          condition: SUCCESSFUL
+          name: csit
+          condition: ALWAYS
           projects:
-            - name: 'functest-netvirt-virtual-suite-master'
+            - name: cperf-apex-csit-master
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl-nofeature-$TOPOLOGY
-                FUNCTEST_MODE=testcase
-                FUNCTEST_SUITE_NAME=tempest_smoke
-                RC_FILE_PATH=$HOME/cloner-info/overcloudrc
+                ODL_BRANCH=$BRANCH
+                RC_FILE_PATH=$SNAP_CACHE/overcloudrc
+                NODE_FILE_PATH=$SNAP_CACHE/node.yaml
+                SSH_KEY_PATH=$SNAP_CACHE/id_rsa
+                ODL_CONTAINERIZED=false
+                OS_VERSION=$OS_VERSION
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
       - multijob:
-          name: csit
+          name: csit-collect-logs
           condition: ALWAYS
           projects:
-            - name: cperf-apex-csit-{stream}
+            - name: cperf-upload-logs-csit
               predefined-parameters: |
                 ODL_BRANCH=$BRANCH
-                RC_FILE_PATH=$SNAP_CACHE/overcloudrc
-                NODE_FILE_PATH=$SNAP_CACHE/node.yaml
-                SSH_KEY_PATH=$SNAP_CACHE/id_rsa
-                ODL_CONTAINERIZED=false
                 OS_VERSION=$OS_VERSION
               node-parameters: true
-              kill-phase-on: NEVER
+              kill-phase-on: FAILURE
               abort-all-job: false
+      - multijob:
+          name: apex-fetch-logs
+          condition: ALWAYS
+          projects:
+            - name: 'apex-fetch-logs-{stream}'
+              current-parameters: false
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
       - multijob:
           name: postprocess
           condition: ALWAYS
@@ -215,7 +224,7 @@
             - 'odl-netvirt-verify-virtual-install-netvirt-.*'
             - 'functest-netvirt-virtual-suite-.*'
             - 'odl-netvirt-verify-virtual-postprocess-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper