X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=ccf7acc60e6520672493e5f4032288523941fe60;hb=a12d99f72ec62e115696a9bb334173213b10c3f2;hp=f36a610faa11b12219246c8b2fd3abaec31f6ef8;hpb=3fb613ba0da515f104bdacdd622db7ec40860256;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index f36a610fa..ccf7acc60 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -153,14 +153,15 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - gerrit-parameter:
-            branch: 'master'
+        - integration-patch-refspec:
+            branch: '$GERRIT_REFSPEC'
 
     scm:
-        - gerrit-trigger-scm:
+        - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
 
     wrappers:
         - build-timeout
@@ -169,9 +170,10 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
+        - integration-trigger-patch-submitted:
             name: 'integration/test'
             branch: 'master'
+            pattern: '**'
 
     builders:
         - shell: |
@@ -179,6 +181,7 @@
             source $WORKSPACE/venv-tox/bin/activate
             pip install tox argparse
             tox --version
+            cd $WORKSPACE/test
             tox
 
     publishers:
@@ -204,7 +207,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: 'master'
         - integration-bundleurl:
@@ -219,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:
@@ -232,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
@@ -279,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:
@@ -366,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
@@ -373,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}'
@@ -407,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'