Merge "Move to odl-lispflowmapping-msmr feature from -all"

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 1a0e144613deec7b89ad2a1eda77151c4201b0d5..ccf7acc60e6520672493e5f4032288523941fe60 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -153,10 +153,14 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
+        - integration-patch-refspec:
+            branch: '$GERRIT_REFSPEC'
 
     scm:
-        - integration-gerrit-test-scm:
+        - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
             branch: 'master'
 
     wrappers:
@@ -166,9 +170,10 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
+        - integration-trigger-patch-submitted:
             name: 'integration/test'
             branch: 'master'
+            pattern: '**'
 
     builders:
         - shell: |
@@ -202,7 +207,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: 'master'
         - integration-bundleurl:
@@ -217,11 +221,10 @@
             test-plan: 'openflowplugin-flow-services.txt'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: 'master'
-        - integration-gerrit-test-scm:
+        - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
+            basedir: 'test'
+            refspec: '$GERRIT_REFSPEC'
             branch: 'master'
 
     wrappers:
@@ -230,14 +233,16 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
 
     triggers:
-        - integration-csit-gerrit-trigger-patch-submitted:
+        - integration-trigger-patch-submitted:
             name: 'integration/test'
             branch: 'master'
+            pattern: 'csit/libraries/*'
 
     builders:
         - integration-get-slave-addresses
@@ -277,17 +282,11 @@
     parameters:
         - project-parameter:
             project: 'integration/distribution'
-        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
 
-    scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: '{branch}'
-
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
@@ -364,6 +363,10 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
+        - gerrit-project-parameter:
+            project: '$GERRIT_PROJECT'
+        - gerrit-refspec-parameter:
+            refspec: '$GERRIT_REFSPEC'
         - project-parameter:
             project: '$GERRIT_PROJECT'
         - integration-distribution-git-url
@@ -371,6 +374,8 @@
     scm:
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
             branch: '{branch}'
         - integration-distribution-scm:
             credentials-id: '{ssh-credentials}'
@@ -405,6 +410,9 @@
         - inject:
             properties-file: 'bundle.txt'
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'