Fixing the patch test job

Change-Id: I16fee6bb146f9ff0080e4d8853dd1f920e2b1059
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index a08fb171e5ecb45c476e877ea3499f4bcef4c4c3..3d6fe8aaa25bc789803915d3e9fbbb45abe80b77 100644 (file)
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -277,6 +277,7 @@
     parameters:
         - project-parameter:
             project: 'integration'
+        - integration-patch-git-url
 
     scm:
         - integration-gerrit-scm:
@@ -302,7 +303,7 @@
                 project-pattern: '**'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**'
+                    branch-pattern: '**/{branch}'
             skip-vote:
                 successful: true
                 failed: true

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index b17eb4dabf36e76f01a43df1ea6b551340b147d6..bbf9fe7992e983f9ddafc594aba1b8520ba2f69f 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -46,12 +46,20 @@
             default: '{test-options}'
             description:  'Robot command options'
 
+- parameter:
+    name: integration-patch-git-url
+    parameters:
+        - string:
+            name: PATCHGITURL
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
+            description:  'Patch GIT URL (do not modify)'
+
 - scm:
     name: integration-gerrit-scm
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
+            url: '$PATCHGITURL'
             basedir: '$GERRIT_PROJECT'
             refspec: '$GERRIT_REFSPEC'
             branches: