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 07c3067a704b70606fdd7be81d7b22d88ede559c..ccf7acc60e6520672493e5f4032288523941fe60 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -153,12 +153,14 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
+        - integration-patch-refspec:
+            branch: '$GERRIT_REFSPEC'
 
     scm:
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
-            refspec: '$GERRIT_REFSPEC'
+            refspec: '$PATCHREFSPEC'
             branch: 'master'
 
     wrappers:
@@ -231,6 +233,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -360,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
@@ -403,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'