Add PATCHREFSPEC parameter in csit job to debug test code in sandbox

PATCHREFSPEC can be filled with integration gerrit patch refspec.

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 15061a4e6c6f688166240f3017ea74cf44f1f52a..1d0a704639cb09be3e79cdf55be872e2c64717f5 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -36,7 +36,7 @@
         - string:
             name: TESTPLAN
             default: '{test-plan}'
-            description:  'Test plan we will run'
+            description: 'Test plan we will run'
 
 - parameter:
     name: integration-test-options
@@ -44,7 +44,7 @@
         - string:
             name: TESTOPTIONS
             default: '{test-options}'
-            description:  'Robot command options'
+            description: 'Robot command options'
 
 - parameter:
     name: integration-patch-git-url
@@ -52,7 +52,15 @@
         - string:
             name: PATCHGITURL
             default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
-            description:  'Patch GIT URL (do not modify)'
+            description: 'Patch GIT URL (do not modify)'
+
+- parameter:
+    name: integration-patch-refspec
+    parameters:
+        - string:
+            name: PATCHREFSPEC
+            default: '{branch}'
+            description: 'Integration Patch Refspec'
 
 - scm:
     name: integration-gerrit-scm
@@ -79,6 +87,18 @@
                 - 'origin/{branch}'
             skip-tag: true
 
+- scm:
+    name: integration-patch-scm
+    scm:
+        - git:
+            credentials-id: '{credentials-id}'
+            url: '$GIT_BASE'
+            refspec: '$PATCHREFSPEC'
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            choosing-strategy: 'gerrit'
+
 - trigger:
     name: integration-distribution-gerrit-trigger-patch-submitted
     triggers:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 5d219ce749d60a104780d47a0fb0ff1fda49d9d1..e42fab9aa16565b7b34b16d52d5ca2920e4f3066 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -109,11 +109,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -200,11 +201,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -292,11 +294,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -382,11 +385,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -544,11 +548,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -633,11 +638,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -789,11 +795,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -883,11 +890,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers: