clean scm defenitions

[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 d44fc36..4a65dcb 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -16,9 +16,14 @@
 # patch verification phases
 #####################################
     phase:
-        - 'install'
-        - 'functest'
-        - 'postprocess'
+        - 'create-apex-vms':
+            slave-label: 'ericsson-virtual5'
+        - 'install-netvirt':
+            slave-label: 'odl-netvirt-virtual'
+        - 'functest':
+            slave-label: 'odl-netvirt-virtual'
+        - 'postprocess':
+            slave-label: 'odl-netvirt-virtual'
 #####################################
 # jobs
 #####################################
@@ -51,24 +56,9 @@
             branch: '{branch}'
         - string:
             name: NETVIRT_ARTIFACT
-            default: $WORKSPACE/distribution-karaf.tar.gz"
+            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
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
     triggers:
         - gerrit:
             server-name: 'git.opendaylight.org'
@@ -77,6 +67,8 @@
                     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: 'opnfv-test'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -88,14 +80,11 @@
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
-        - shell: |
-            #!/bin/bash
-            ls -al $WORKSPACE
         - 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
@@ -105,14 +94,15 @@
                     GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
                     GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
                     NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
-                  node-parameters: true
+                    APEX_ENV_NUMBER=$APEX_ENV_NUMBER
+                  node-parameters: false
                   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
@@ -126,8 +116,19 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
-            name: postprocess
+            name: functest
             condition: SUCCESSFUL
+            projects:
+                - name: 'functest-netvirt-virtual-suite-{stream}'
+                  predefined-parameters: |
+                    FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn
+                    RC_FILE_PATH=/home/jenkins/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
@@ -164,16 +165,8 @@
                 - '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
@@ -183,7 +176,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'odl-netvirt-virtual-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
 
     builders:
@@ -194,19 +187,22 @@
 # builder macros
 #####################################
 - builder:
-    name: 'netvirt-verify-install-builder'
+    name: 'netvirt-verify-create-apex-vms-builder'
+    builders:
+        - shell:
+            !include-raw: ./create-apex-vms.sh
+- builder:
+    name: 'netvirt-verify-install-netvirt-builder'
     builders:
         - shell:
             !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: