X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2F3rd_party_ci%2Fodl-netvirt.yml;h=d070d0b3738947407f45bc7109a020075d4575f3;hb=fd9e3214b0d4b9918c9378026cb2c72182b52d07;hp=3fd007764b8d09552cb22d49571fdeec82aacbf2;hpb=8578eae1f451aef3ce4f4f499f43ed924a2a0efa;p=releng.git

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 3fd007764..d070d0b37 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
 #####################################
@@ -16,9 +16,12 @@
 # patch verification phases
 #####################################
     phase:
-        - 'install'
-        - 'functest'
-        - 'postprocess'
+        - 'create-apex-vms':
+            slave-label: 'odl-netvirt-virtual-intel'
+        - 'install-netvirt':
+            slave-label: 'odl-netvirt-virtual-intel'
+        - 'postprocess':
+            slave-label: 'odl-netvirt-virtual-intel'
 #####################################
 # jobs
 #####################################
@@ -38,41 +41,40 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 5
             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}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: NETVIRT_ARTIFACT
-            default: $WORKSPACE/distribution-karaf.tar.gz"
-        - 'odl-netvirt-virtual-defaults'
-
-    scm:
-        - git:
-            url: 'https://git.opendaylight.org/gerrit/p/$PROJECT.git'
-            refspec: '$GERRIT_REFSPEC'
-            branches:
-                - 'origin/$GERRIT_BRANCH'
-            skip-tag: true
-            choosing-strategy: 'gerrit'
-            timeout: 10
-            wipe-workspace: true
+            default: distribution-karaf.tar.gz
+        - 'odl-netvirt-virtual-intel-defaults'
 
     triggers:
         - gerrit:
             server-name: 'git.opendaylight.org'
             trigger-on:
+ #               - comment-added-contains-event:
+ #                   comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : SUCCESS'
+ #               - comment-added-contains-event:
+ #                   comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : UNSTABLE'
                 - comment-added-contains-event:
-                    comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : SUCCESS'
-                - comment-added-contains-event:
-                    comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : UNSTABLE'
+                    comment-contains-value: 'opnfv-test'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -85,30 +87,31 @@
         - description-setter:
             description: "Built on $NODE_NAME"
         - multijob:
-            name: install
+            name: create-apex-vms
             condition: SUCCESSFUL
             projects:
-                - name: 'odl-netvirt-verify-virtual-install-{stream}'
+                - name: 'odl-netvirt-verify-virtual-create-apex-vms-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$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
+                    APEX_ENV_NUMBER=$APEX_ENV_NUMBER
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
-            name: functest
+            name: install-netvirt
             condition: SUCCESSFUL
             projects:
-                - name: 'odl-netvirt-verify-virtual-functest-{stream}'
+                - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
@@ -119,13 +122,25 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
-            name: postprocess
+            name: functest
             condition: SUCCESSFUL
+            projects:
+                - name: 'functest-netvirt-virtual-suite-{stream}'
+                  predefined-parameters: |
+                    DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+                    FUNCTEST_SUITE_NAME=healthcheck
+                    RC_FILE_PATH=~/cloner-info/overcloudrc
+                  node-parameters: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: false
+        - multijob:
+            name: postprocess
+            condition: ALWAYS
             projects:
                 - name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
@@ -134,7 +149,7 @@
                     NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
                   node-parameters: true
                   kill-phase-on: FAILURE
-                  abort-all-job: true
+                  abort-all-job: false
 
 - job-template:
     name: 'odl-netvirt-verify-virtual-{phase}-{stream}'
@@ -144,6 +159,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 5
@@ -152,32 +168,40 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'odl-netvirt-verify-virtual-install-.*'
-                - 'odl-netvirt-verify-virtual-functest-.*'
+                - 'odl-netvirt-verify-virtual-create-apex-vms-.*'
+                - 'odl-netvirt-verify-virtual-install-netvirt-.*'
+                - 'functest-netvirt-virtual-suite-.*'
                 - 'odl-netvirt-verify-virtual-postprocess-.*'
             block-level: 'NODE'
 
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             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}'
-        - gerrit-parameter:
             branch: '{branch}'
-        - 'odl-netvirt-virtual-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - string:
+            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:
@@ -187,19 +211,17 @@
 # builder macros
 #####################################
 - builder:
-    name: 'netvirt-verify-install-builder'
+    name: 'netvirt-verify-create-apex-vms-builder'
     builders:
         - shell:
-            !include-raw: ./download-netvirt-artifact.sh
-        - shell:
-            !include-raw: ./install-netvirt.sh
-
+            !include-raw: ../apex/apex-snapshot-deploy.sh
 - builder:
-    name: 'netvirt-verify-functest-builder'
+    name: 'netvirt-verify-install-netvirt-builder'
     builders:
         - shell:
-            !include-raw: ./functest-netvirt.sh
-
+            !include-raw: ./download-netvirt-artifact.sh
+        - shell:
+            !include-raw: ./install-netvirt.sh
 - builder:
     name: 'netvirt-verify-postprocess-builder'
     builders: