Enable integration-patch-test-{stream} to specify GERRIT_*

This is to enable the job to be used in Sandbox.
Defines new macros in releng-macros.yaml

Change-Id: I9ec33baa624c83512c78909f1667ab668d1ba736
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index afaae02666b90cb964648267ee09f6150fa91c02..2a4b45f1a0fb26c49e0fbefa3f3b624cd7874db5 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -362,6 +362,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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index df2d8f28cca0a4abedc7cb3ffaf3ea808bf174d7..087529a71b37d3844ddafafe9fe3a0a0b1e0426f 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -16,6 +16,22 @@
             default: '{branch}'
             description: "JJB configured GERRIT_BRANCH parameter"
 
+- parameter:
+    name: gerrit-project-parameter
+    parameters:
+        - string:
+            name: GERRIT_PROJECT
+            default: '{project}'
+            description: "GERRIT_PROJECT parameter if not given by trigger"
+
+- parameter:
+    name: gerrit-refspec-parameter
+    parameters:
+        - string:
+            name: GERRIT_REFSPEC
+            default: '{refspec}'
+            description: "GERRIT_REFSPEC parameter if not given by trigger"
+
 - scm:
     name: git-scm
     scm: