Fix branch variable in github scm

The branch variable should not be
concatenated with refs/heads.
GHPRB makes use of variables to
put here.

Change-Id: I54c6f3f51b734b894abb090d4473683a3e34fa06
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>

diff --git a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job
index 4837417..112b3d2 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job
+++ b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job
@@ -83,7 +83,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge
index 06aadff..5685e85 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-jjb-merge
+++ b/.jjb-test/expected-xml/github-ciman-jjb-merge
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify
index 01cae70..217a127 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-jjb-verify
+++ b/.jjb-test/expected-xml/github-ciman-jjb-verify
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

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 eeacda3..03b12b0 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
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

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 c194add..020c951 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

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 32bf4fb..6fd70d1 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
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

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 1fce814..5c2c23e 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify
index d36b762..e69dfc1 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-packer-verify
+++ b/.jjb-test/expected-xml/github-ciman-packer-verify
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master
index 24a08cf..a8fb406 100644 (file)
--- a/.jjb-test/expected-xml/github-maven-maven-clm-master
+++ b/.jjb-test/expected-xml/github-maven-maven-clm-master
@@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
index 64819b2..1aaa745 100644 (file)
--- a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
@@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
index 59634f3..ce8c135 100644 (file)
--- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
@@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master
index 169f1ad..7eecd71 100644 (file)
--- a/.jjb-test/expected-xml/github-maven-maven-release-master
+++ b/.jjb-test/expected-xml/github-maven-maven-release-master
@@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
index 73d6b99..48913f0 100644 (file)
--- a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
+++ b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
@@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar
index 440e1f9..6a5d1d9 100644 (file)
--- a/.jjb-test/expected-xml/github-maven-sonar
+++ b/.jjb-test/expected-xml/github-maven-sonar
@@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-node-node-verify-master b/.jjb-test/expected-xml/github-node-node-verify-master
index 65449df..5884aac 100644 (file)
--- a/.jjb-test/expected-xml/github-node-node-verify-master
+++ b/.jjb-test/expected-xml/github-node-node-verify-master
@@ -93,7 +93,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master
index 99e353d..c3c0fed 100644 (file)
--- a/.jjb-test/expected-xml/github-python-tox-verify-master
+++ b/.jjb-test/expected-xml/github-python-tox-verify-master
@@ -96,7 +96,7 @@ Example: docs,py2,py3
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master
index 26f5a61..6a9119b 100644 (file)
--- a/.jjb-test/expected-xml/github-rtd-rtd-verify-master
+++ b/.jjb-test/expected-xml/github-rtd-rtd-verify-master
@@ -83,7 +83,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>

diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst
index a3cdc90..a5da00d 100644 (file)
--- a/docs/jjb/lf-macros.rst
+++ b/docs/jjb/lf-macros.rst
@@ -207,6 +207,10 @@ lf-infra-github-scm
 
 Basic SCM configuration for GitHub based projects.
 
+On the `branch` variable you can assign `$sha1` or `$ghprbActualCommit`
+as the value.  This will require that the job be triggered via
+the GHPRB plugin and not manually.
+
 Triggers
 ========
 

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 8408b6c..1167ca4 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -392,7 +392,7 @@
           url: '{url}'
           refspec: '{refspec}'
           branches:
-            - 'refs/heads/{branch}'
+            - '{branch}'
           skip-tag: true
           wipe-workspace: true
           submodule: