Add default refspec reference

Missed this when we ported over the infra-parameters. Refspec should
default to refs/heads/{branch} so that a manual run of a job will always
work against the specified branch for verify jobs. Merge jobs ignore
this by defining a blank refspec.

Change-Id: I7d7323b85b61639eef0e1b4491d6ba94d934b714
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-merge b/jjb-test/expected-xml/gerrit-ciman-jjb-merge
index 0cc8742..93149c9 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-jjb-merge
+++ b/jjb-test/expected-xml/gerrit-ciman-jjb-merge
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>JJB_VERSION</name>

diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-verify b/jjb-test/expected-xml/gerrit-ciman-jjb-verify
index 4c98280..61e2a61 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-jjb-verify
+++ b/jjb-test/expected-xml/gerrit-ciman-jjb-verify
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>JJB_VERSION</name>

diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
index 730f528..4fde590 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
index 367f17d..771c62e 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
index 27466db..1713560 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
index a62d877..62be790 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-verify b/jjb-test/expected-xml/gerrit-ciman-packer-verify
index 8681cd8..51f67c0 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-packer-verify
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-verify
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/gerrit-maven-maven-clm-master b/jjb-test/expected-xml/gerrit-maven-maven-clm-master
index 200df48..6786db9 100644 (file)
--- a/jjb-test/expected-xml/gerrit-maven-maven-clm-master
+++ b/jjb-test/expected-xml/gerrit-maven-maven-clm-master
@@ -63,7 +63,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>MAVEN_OPTS</name>

diff --git a/jjb-test/expected-xml/gerrit-maven-maven-release-master b/jjb-test/expected-xml/gerrit-maven-maven-release-master
index 5e0bba8..dd9ddc3 100644 (file)
--- a/jjb-test/expected-xml/gerrit-maven-maven-release-master
+++ b/jjb-test/expected-xml/gerrit-maven-maven-release-master
@@ -63,7 +63,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>MAVEN_OPTS</name>

diff --git a/jjb-test/expected-xml/gerrit-python-tox-verify-master b/jjb-test/expected-xml/gerrit-python-tox-verify-master
index 9e8ebf1..30fa7f1 100644 (file)
--- a/jjb-test/expected-xml/gerrit-python-tox-verify-master
+++ b/jjb-test/expected-xml/gerrit-python-tox-verify-master
@@ -62,7 +62,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>TOX_DIR</name>

diff --git a/jjb-test/expected-xml/github-ciman-jjb-merge b/jjb-test/expected-xml/github-ciman-jjb-merge
index ce75fbc..ab6cdb5 100644 (file)
--- a/jjb-test/expected-xml/github-ciman-jjb-merge
+++ b/jjb-test/expected-xml/github-ciman-jjb-merge
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>JJB_VERSION</name>

diff --git a/jjb-test/expected-xml/github-ciman-jjb-verify b/jjb-test/expected-xml/github-ciman-jjb-verify
index dc8b94a..1f0e9d5 100644 (file)
--- a/jjb-test/expected-xml/github-ciman-jjb-verify
+++ b/jjb-test/expected-xml/github-ciman-jjb-verify
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>JJB_VERSION</name>

diff --git a/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder b/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
index 699ac5d..36755e6 100644 (file)
--- a/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet b/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
index 64a5a7c..44c9896 100644 (file)
--- a/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
index 719709c..c8ff442 100644 (file)
--- a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
index cac1b63..a48988a 100644 (file)
--- a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/github-ciman-packer-verify b/jjb-test/expected-xml/github-ciman-packer-verify
index b46c68c..5386b73 100644 (file)
--- a/jjb-test/expected-xml/github-ciman-packer-verify
+++ b/jjb-test/expected-xml/github-ciman-packer-verify
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>

diff --git a/jjb-test/expected-xml/github-maven-maven-clm-master b/jjb-test/expected-xml/github-maven-maven-clm-master
index b9ac069..414d3d4 100644 (file)
--- a/jjb-test/expected-xml/github-maven-maven-clm-master
+++ b/jjb-test/expected-xml/github-maven-maven-clm-master
@@ -58,7 +58,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>MAVEN_OPTS</name>

diff --git a/jjb-test/expected-xml/github-maven-maven-release-master b/jjb-test/expected-xml/github-maven-maven-release-master
index e669719..9a415e2 100644 (file)
--- a/jjb-test/expected-xml/github-maven-maven-release-master
+++ b/jjb-test/expected-xml/github-maven-maven-release-master
@@ -58,7 +58,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>MAVEN_OPTS</name>

diff --git a/jjb-test/expected-xml/github-python-tox-verify-master b/jjb-test/expected-xml/github-python-tox-verify-master
index c18a8cd..7a8a99b 100644 (file)
--- a/jjb-test/expected-xml/github-python-tox-verify-master
+++ b/jjb-test/expected-xml/github-python-tox-verify-master
@@ -57,7 +57,7 @@ job is triggered by Gerrit.
 Note that Gerrit will override this parameter automatically if a
 job is triggered by Gerrit.
 </description>
-          <defaultValue/>
+          <defaultValue>refs/heads/master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>TOX_DIR</name>

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 10a332a..eb25459 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -266,7 +266,7 @@
               job is triggered by Gerrit.
       - string:
           name: GERRIT_REFSPEC
-          default: ''
+          default: 'refs/heads/{branch}'
           description: |
               Parameter to identify a refspec when pulling from Gerrit.